[meta-fsl-arm][PATCH v4 00/13] patches for qoriq fsl-sdk-v1.8

[meta-fsl-arm][PATCH v4 00/13] patches for qoriq fsl-sdk-v1.8

[b28495]

From: Ting Liu <ting.liu@freescale.com>

Changes in v4:
update commit msg
add the linking and timestamps for zImage in linux-ls1

Ting Liu (13):
  linux-ls1: update to revision f488de6
  u-boot-ls1: merge u-boot-ls1.inc into recipe
  u-boot-ls1: update to revision v2015.01-630-g6ba8eed
  ls1021aqds: remove as it is not supported
  ls1021atwr: update lquart/secure-boot UBOOT_CONFIG
  qemu-fsl: upgrade from v1.7 to v2.2.0
  linux-ls1: package zImage into kernel-image
  cst: update to revision 6f57c86
  rcw: update to revision 426f7a6
  asf: update to revision 62ba10a
  asf: use KBUILD_OUTPUT to point to build-artifacts
  rename ls-base.inc -> qoriq-arm.inc
  layer.conf: include layer-specific bb files

 conf/layer.conf                                    |   3 +
 .../machine/include/{ls-base.inc => qoriq-arm.inc} |   0
 conf/machine/ls1021aqds.conf                       |  25 --
 conf/machine/ls1021atwr.conf                       |   5 +-
 openembedded-layer/recipes-kernel/asf/asf_git.bb   |  10 +-
 ...ake-BOARDS-DESTDIR-overidable-in-Makefile.patch |   2 +-
 recipes-bsp/rcw/rcw_git.bb                         |   6 +-
 recipes-bsp/u-boot/u-boot-ls1.inc                  |  17 -
 recipes-bsp/u-boot/u-boot-ls1_2014.07.bb           |  31 --
 recipes-bsp/u-boot/u-boot-ls1_2015.01.bb           |  48 +++
 recipes-devtools/cst/cst_git.bb                    |   6 +-
 recipes-devtools/qemu/qemu-fsl_git.bb              |  34 +-
 recipes-kernel/linux/linux-ls1.inc                 |  13 +
 recipes-kernel/linux/linux-ls1/defconfig           | 460 ++++++++++++++-------
 recipes-kernel/linux/linux-ls1_3.12.bb             |   4 +-
 15 files changed, 418 insertions(+), 246 deletions(-)
 rename conf/machine/include/{ls-base.inc => qoriq-arm.inc} (100%)
 delete mode 100644 conf/machine/ls1021aqds.conf
 delete mode 100644 recipes-bsp/u-boot/u-boot-ls1.inc
 delete mode 100644 recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-ls1_2015.01.bb

-- 
1.9.1

[meta-fsl-arm][PATCH v4 01/13] linux-ls1: update to revision f488de6

[b28495]

From: Ting Liu <ting.liu@freescale.com>

Minor version update to 3.12.37-rt51 with new features:
* e6500 hugepage TLB miss performance improvement
* T1023RDB support
* T1040D4RDB and T1042D4RDB support
* DIU [T1042]
* DPAA Ethernet: loadable module
* eMMC: DDR mode [T2080]
* eTSEC: Gianfar upstream updates and fixes
* fmlib: table statistics, stats extension
* IEEE802.1AE (MACSEC) and IEEE802.1X (port-based network access control) [T104x, T102x]
* IEEE1588 ptpd open source stack includes more DPAA processors: P1023, P2041, P3041, P5020, P5040, T4240, T1023
* LAG SGMII 2.5G ports support - IPv4 traffics forwarding on aggregated 2 x 2.5Gb L2 Switch FMAN ports [1040]
* LAG support of IPv6 traffics forwarding and TCP/UDP traffics over IPv6 forwarding (2 x 2.5Gb L2 Switch WAN) [1040]
* LAG support of IPv6 traffics forwarding and TCP/UDP traffics over IPv6 forwarding on both 1 G RGMII port and 1G SGMII port [1040]
* Power Management: Power off feature for all QDS boards except B9132QDS and B4860QDS
* SEC: QI Driver IPSec performance improvement
* SGMII 2.5G fixed link [T1024]
* USB: Dual UTMI

For detailed history, see
http://git.freescale.com/git/cgit.cgi/ppc/sdk/linux.git/tag/?id=fsl-sdk-v1.8

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 recipes-kernel/linux/linux-ls1/defconfig | 460 +++++++++++++++++++++----------
 recipes-kernel/linux/linux-ls1_3.12.bb   |   4 +-
 2 files changed, 321 insertions(+), 143 deletions(-)

diff --git a/recipes-kernel/linux/linux-ls1/defconfig b/recipes-kernel/linux/linux-ls1/defconfig
index 732afcc..fff637a 100644
--- a/recipes-kernel/linux/linux-ls1/defconfig
+++ b/recipes-kernel/linux/linux-ls1/defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.12.0 Kernel Configuration
+# Linux/arm 3.12.37 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_MIGHT_HAVE_PCI=y
@@ -10,6 +10,7 @@ CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPUFREQ=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ZONE_DMA=y
@@ -56,6 +57,7 @@ CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_DEBUG=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_KTIME_SCALAR=y
@@ -132,7 +134,7 @@ CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-# CONFIG_AIO is not set
+CONFIG_AIO=y
 CONFIG_PCI_QUIRKS=y
 CONFIG_EMBEDDED=y
 CONFIG_HAVE_PERF_EVENTS=y
@@ -141,7 +143,8 @@ CONFIG_PERF_USE_VMALLOC=y
 #
 # Kernel Performance Events And Counters
 #
-# CONFIG_PERF_EVENTS is not set
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_SLUB_DEBUG is not set
 CONFIG_COMPAT_BRK=y
@@ -149,11 +152,13 @@ CONFIG_COMPAT_BRK=y
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_SLUB_CPU_PARTIAL=y
-# CONFIG_PROFILING is not set
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=y
 CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
+CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+CONFIG_KRETPROBES=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
@@ -165,12 +170,14 @@ CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
@@ -179,6 +186,7 @@ CONFIG_OLD_SIGACTION=y
 #
 # GCOV-based kernel profiling
 #
+# CONFIG_GCOV_KERNEL is not set
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
@@ -214,9 +222,14 @@ CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
-# CONFIG_FREEZER is not set
+CONFIG_FREEZER=y
 
 #
 # System Type
@@ -285,8 +298,6 @@ CONFIG_ARCH_MXC=y
 # CONFIG_MXC_IRQ_PRIOR is not set
 # CONFIG_MXC_DEBUG_BOARD is not set
 CONFIG_HAVE_IMX_SRC=y
-CONFIG_FSL_SOC=y
-CONFIG_ARCH_LAYERSCAPE=y
 
 #
 # i.MX51 machines:
@@ -302,6 +313,7 @@ CONFIG_ARCH_LAYERSCAPE=y
 # CONFIG_SOC_IMX6Q is not set
 # CONFIG_SOC_IMX6SL is not set
 # CONFIG_SOC_VF610 is not set
+CONFIG_FSL_SOC=y
 CONFIG_SOC_LS1021A=y
 # CONFIG_ARCH_OMAP3 is not set
 # CONFIG_ARCH_OMAP4 is not set
@@ -371,7 +383,6 @@ CONFIG_MULTI_IRQ_HANDLER=y
 #
 # Bus support
 #
-CONFIG_ARM_AMBA=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_SYSCALL=y
@@ -387,10 +398,8 @@ CONFIG_PCI_MSI=y
 # PCI host controller drivers
 #
 CONFIG_PCIE_DW=y
-CONFIG_PCIE_LAYERSCAPE=y
-CONFIG_PCIEPORTBUS=y
-# CONFIG_PCIEAER is not set
-# CONFIG_PCIEASPM is not set
+CONFIG_PCI_LAYERSCAPE=y
+# CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCCARD is not set
 
 #
@@ -409,12 +418,15 @@ CONFIG_VMSPLIT_2G=y
 # CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0x80000000
 CONFIG_NR_CPUS=4
-# CONFIG_HOTPLUG_CPU is not set
+CONFIG_HOTPLUG_CPU=y
 # CONFIG_ARM_PSCI is not set
-#CONFIG_ARCH_NR_GPIO=0
+CONFIG_ARCH_NR_GPIO=0
+CONFIG_HAVE_PREEMPT_LAZY=y
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT__LL is not set
+# CONFIG_PREEMPT_RTB is not set
+# CONFIG_PREEMPT_RT_FULL is not set
 CONFIG_HZ_FIXED=0
 CONFIG_HZ_100=y
 # CONFIG_HZ_200 is not set
@@ -424,14 +436,16 @@ CONFIG_HZ_100=y
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
-# CONFIG_THUMB2_KERNEL is not set
+CONFIG_THUMB2_KERNEL=y
+CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
+CONFIG_ARM_ASM_UNIFIED=y
 CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HIGHMEM=y
 # CONFIG_HIGHPTE is not set
+CONFIG_HW_PERF_EVENTS=y
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_FLATMEM=y
@@ -439,7 +453,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_HAVE_MEMBLOCK=y
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=999999
+CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
@@ -474,6 +488,7 @@ CONFIG_CMDLINE="console=ttyS0,115200"
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
+# CONFIG_KEXEC is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_AUTO_ZRELADDR=y
 
@@ -482,6 +497,30 @@ CONFIG_AUTO_ZRELADDR=y
 #
 
 #
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+
+#
+# ARM CPU frequency scaling drivers
+#
+# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
+CONFIG_QORIQ_CPUFREQ=y
+
+#
 # CPU Idle
 #
 CONFIG_CPU_IDLE=y
@@ -492,7 +531,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 #
 # ARM CPU Idle Drivers
 #
-CONFIG_ARM_LS1_CPUIDLE=y
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 
 #
@@ -521,11 +559,21 @@ CONFIG_COREDUMP=y
 #
 # Power management options
 #
-# CONFIG_SUSPEND is not set
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
 # CONFIG_PM_RUNTIME is not set
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_APM_EMULATION is not set
+CONFIG_PM_CLK=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_CPU_PM=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ARM_CPU_SUSPEND is not set
+CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_NET=y
 
 #
@@ -557,7 +605,7 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE_DEMUX is not set
-CONFIG_NET_IP_TUNNEL=y
+# CONFIG_NET_IP_TUNNEL is not set
 CONFIG_IP_MROUTE=y
 # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
 # CONFIG_IP_PIMSM_V1 is not set
@@ -580,27 +628,7 @@ CONFIG_INET_UDP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=y
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_BEET=y
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-CONFIG_IPV6_SIT=y
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IPV6_GRE is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_MROUTE is not set
+# CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
@@ -623,12 +651,6 @@ CONFIG_NETFILTER_ADVANCED=y
 # CONFIG_NF_DEFRAG_IPV4 is not set
 # CONFIG_IP_NF_IPTABLES is not set
 # CONFIG_IP_NF_ARPTABLES is not set
-
-#
-# IPv6: Netfilter Configuration
-#
-# CONFIG_NF_DEFRAG_IPV6 is not set
-# CONFIG_IP6_NF_IPTABLES is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -667,6 +689,7 @@ CONFIG_NET_FLOW_LIMIT=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_TCPPROBE is not set
 # CONFIG_HAMRADIO is not set
 CONFIG_CAN=y
 CONFIG_CAN_RAW=y
@@ -680,10 +703,11 @@ CONFIG_CAN_RAW=y
 # CONFIG_CAN_SLCAN is not set
 CONFIG_CAN_DEV=y
 CONFIG_CAN_CALC_BITTIMING=y
-# CONFIG_CAN_LEDS is not set
 # CONFIG_CAN_AT91 is not set
 # CONFIG_CAN_MCP251X is not set
 CONFIG_CAN_FLEXCAN=y
+# CONFIG_CAN_FLEXCAN_RX_FIFO_EN is not set
+# CONFIG_CAN_FLEXCAN_ERRATA_ERR005829 is not set
 # CONFIG_PCH_CAN is not set
 # CONFIG_CAN_GRCAN is not set
 # CONFIG_CAN_SJA1000 is not set
@@ -712,6 +736,7 @@ CONFIG_WIRELESS=y
 #
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
+# CONFIG_RFKILL_REGULATOR is not set
 # CONFIG_NET_9P is not set
 # CONFIG_CAIF is not set
 # CONFIG_CEPH_LIB is not set
@@ -736,6 +761,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_MMIO=y
 # CONFIG_DMA_SHARED_BUFFER is not set
 
@@ -777,7 +804,7 @@ CONFIG_MTD_CFI_ADV_OPTIONS=y
 # CONFIG_MTD_CFI_NOSWAP is not set
 CONFIG_MTD_CFI_BE_BYTE_SWAP=y
 # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_GEOMETRY is not set
+CONFIG_MTD_CFI_GEOMETRY=y
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -810,9 +837,11 @@ CONFIG_MTD_PHYSMAP_OF=y
 # Self-contained MTD device drivers
 #
 # CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_SST25L is not set
+CONFIG_MTD_DATAFLASH=y
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+# CONFIG_MTD_DATAFLASH_OTP is not set
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_SST25L=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
@@ -844,6 +873,8 @@ CONFIG_MTD_NAND_FSL_IFC=y
 # LPDDR flash memory drivers
 #
 # CONFIG_MTD_LPDDR is not set
+CONFIG_MTD_SPI_NOR_BASE=y
+CONFIG_SPI_FSL_QUADSPI=y
 # CONFIG_MTD_UBI is not set
 CONFIG_DTC=y
 CONFIG_OF=y
@@ -863,7 +894,6 @@ CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
 CONFIG_OF_MTD=y
 # CONFIG_PARPORT is not set
-# CONFIG_QUICC_ENGINE is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -894,12 +924,14 @@ CONFIG_BLK_DEV_RAM_SIZE=262144
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_ATMEL_PWM is not set
 # CONFIG_DUMMY_IRQ is not set
+CONFIG_HWLAT_DETECTOR=m
 # CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
 # CONFIG_ICS932S401 is not set
 # CONFIG_ATMEL_SSC is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_FSL_DCM is not set
 # CONFIG_HP_ILO is not set
 # CONFIG_APDS9802ALS is not set
 # CONFIG_ISL29003 is not set
@@ -916,7 +948,7 @@ CONFIG_BLK_DEV_RAM_SIZE=262144
 # CONFIG_PCH_PHUB is not set
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
-# CONFIG_SRAM is not set
+CONFIG_SRAM=y
 # CONFIG_C2PORT is not set
 
 #
@@ -1041,12 +1073,13 @@ CONFIG_SATA_PMP=y
 #
 # Controllers with non-SFF native interface
 #
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_AHCI_PLATFORM is not set
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
+# CONFIG_AHCI_IMX is not set
 # CONFIG_SATA_FSL is not set
 # CONFIG_SATA_INIC162X is not set
 # CONFIG_SATA_ACARD_AHCI is not set
-# CONFIG_SATA_SIL24 is not set
+CONFIG_SATA_SIL24=y
 CONFIG_ATA_SFF=y
 
 #
@@ -1142,6 +1175,7 @@ CONFIG_ATA_BMDMA=y
 # CONFIG_FIREWIRE_NOSY is not set
 # CONFIG_I2O is not set
 CONFIG_NETDEVICES=y
+# CONFIG_AS_FASTPATH is not set
 CONFIG_NET_CORE=y
 # CONFIG_BONDING is not set
 # CONFIG_DUMMY is not set
@@ -1230,11 +1264,17 @@ CONFIG_FEC=y
 CONFIG_FSL_PQ_MDIO=y
 # CONFIG_FSL_XGMAC_MDIO is not set
 CONFIG_GIANFAR=y
+# CONFIG_FSL_GIANFAR_1588 is not set
+# CONFIG_GFAR_DBG_LOOP is not set
+
+#
+# Frame Manager support
+#
 CONFIG_NET_VENDOR_HP=y
 # CONFIG_HP100 is not set
 CONFIG_NET_VENDOR_INTEL=y
 # CONFIG_E100 is not set
-CONFIG_E1000=y
+# CONFIG_E1000 is not set
 CONFIG_E1000E=y
 # CONFIG_IGB is not set
 # CONFIG_IGBVF is not set
@@ -1326,6 +1366,7 @@ CONFIG_PHYLIB=y
 #
 # CONFIG_AT803X_PHY is not set
 # CONFIG_AMD_PHY is not set
+# CONFIG_ATHEROS_PHY is not set
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_QSEMI_PHY is not set
@@ -1338,14 +1379,16 @@ CONFIG_BROADCOM_PHY=y
 # CONFIG_ICPLUS_PHY is not set
 CONFIG_REALTEK_PHY=y
 CONFIG_NATIONAL_PHY=y
+# CONFIG_DP8384x_PHY is not set
 # CONFIG_STE10XP is not set
 # CONFIG_LSI_ET1011C_PHY is not set
 CONFIG_MICREL_PHY=y
 # CONFIG_FIXED_PHY is not set
 # CONFIG_MDIO_BITBANG is not set
 CONFIG_MDIO_BUS_MUX=y
-CONFIG_MDIO_BUS_MUX_GPIO=y
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
 CONFIG_MDIO_BUS_MUX_MMIOREG=y
+# CONFIG_FSL_10GBASE_KR is not set
 # CONFIG_MICREL_KS8995MA is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
@@ -1408,7 +1451,6 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_TCA6416 is not set
 # CONFIG_KEYBOARD_TCA8418 is not set
 # CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_LM8333 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
 # CONFIG_KEYBOARD_MCS is not set
@@ -1448,7 +1490,6 @@ CONFIG_MOUSE_PS2_CYPRESS=y
 #
 CONFIG_SERIO=y
 CONFIG_SERIO_SERPORT=m
-# CONFIG_SERIO_AMBAKMI is not set
 # CONFIG_SERIO_PCIPS2 is not set
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_RAW is not set
@@ -1466,6 +1507,7 @@ CONFIG_TTY=y
 CONFIG_VT=y
 # CONFIG_CONSOLE_TRANSLATIONS is not set
 CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
@@ -1499,8 +1541,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
 #
 # Non-8250 serial port support
 #
-# CONFIG_SERIAL_AMBA_PL010 is not set
-# CONFIG_SERIAL_AMBA_PL011 is not set
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX310X is not set
 # CONFIG_SERIAL_MFD_HSU is not set
@@ -1579,7 +1619,6 @@ CONFIG_I2C_HELPER_AUTO=y
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_GPIO is not set
 CONFIG_I2C_IMX=y
-# CONFIG_I2C_NOMADIK is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_PXA_PCI is not set
@@ -1615,9 +1654,7 @@ CONFIG_SPI_BITBANG=y
 # CONFIG_SPI_FSL_SPI is not set
 CONFIG_SPI_FSL_DSPI=y
 # CONFIG_SPI_FSL_ESPI is not set
-# CONFIG_SPI_FSL_QUADSPI is not set
 # CONFIG_SPI_OC_TINY is not set
-# CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
 # CONFIG_SPI_SC18IS602 is not set
@@ -1674,7 +1711,6 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_EM is not set
 CONFIG_GPIO_MPC8XXX=y
-# CONFIG_GPIO_PL061 is not set
 # CONFIG_GPIO_RCAR is not set
 # CONFIG_GPIO_TS5500 is not set
 # CONFIG_GPIO_VX855 is not set
@@ -1778,7 +1814,7 @@ CONFIG_HWMON=y
 CONFIG_SENSORS_LM90=y
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_LM93 is not set
- CONFIG_SENSORS_LTC2945
+CONFIG_SENSORS_LTC2945=y
 # CONFIG_SENSORS_LTC4151 is not set
 # CONFIG_SENSORS_LTC4215 is not set
 # CONFIG_SENSORS_LTC4245 is not set
@@ -1797,6 +1833,7 @@ CONFIG_SENSORS_LM90=y
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MCP3021 is not set
 # CONFIG_SENSORS_NCT6775 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_PCF8591 is not set
@@ -1813,6 +1850,8 @@ CONFIG_SENSORS_LM90=y
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_SCH56XX_COMMON is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_SCH5636 is not set
 # CONFIG_SENSORS_ADS1015 is not set
 # CONFIG_SENSORS_ADS7828 is not set
 # CONFIG_SENSORS_ADS7871 is not set
@@ -1836,7 +1875,31 @@ CONFIG_SENSORS_INA2XX=y
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_DW_WATCHDOG is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+CONFIG_IMX2_WDT=y
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_I6300ESB_WDT is not set
+# CONFIG_MEN_A21_WDT is not set
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 
 #
@@ -1895,7 +1958,7 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_SMSC is not set
 # CONFIG_ABX500_CORE is not set
 # CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SYSCON is not set
+CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP8788 is not set
 # CONFIG_MFD_PALMAS is not set
@@ -1929,7 +1992,33 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_VEXPRESS_CONFIG is not set
-# CONFIG_REGULATOR is not set
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_DEBUG=y
+CONFIG_REGULATOR_DUMMY=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_DA9210 is not set
+# CONFIG_REGULATOR_FAN53555 is not set
+# CONFIG_REGULATOR_GPIO is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_LP872X is not set
+# CONFIG_REGULATOR_LP8755 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_PFUZE100 is not set
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS6524X is not set
 # CONFIG_MEDIA_SUPPORT is not set
 
 #
@@ -1941,6 +2030,7 @@ CONFIG_VGA_ARB_MAX_GPUS=16
 # CONFIG_TEGRA_HOST1X is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
@@ -1965,7 +2055,6 @@ CONFIG_FB_MODE_HELPERS=y
 #
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
-# CONFIG_FB_ARMCLCD is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
@@ -1989,8 +2078,10 @@ CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
 # CONFIG_FB_CARMINE is not set
-# CONFIG_FB_FSL_DCU is not set
+CONFIG_FB_FSL_SII902X=y
+CONFIG_FB_FSL_DCU=y
 # CONFIG_FB_FSL_DIU is not set
+# CONFIG_FB_SSD1289 is not set
 # CONFIG_FB_SMSCUFX is not set
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_GOLDFISH is not set
@@ -2016,7 +2107,123 @@ CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 CONFIG_LOGO_LINUX_CLUT224=y
 # CONFIG_FB_SSD1307 is not set
-# CONFIG_SOUND is not set
+CONFIG_SOUND=y
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+CONFIG_SND_DMAENGINE_PCM=y
+CONFIG_SND_COMPRESS_OFFLOAD=y
+CONFIG_SND_JACK=y
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_ALOOP is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_OXYGEN is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LOLA is not set
+# CONFIG_SND_LX6464ES is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+CONFIG_SND_ARM=y
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_UA101 is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_USB_HIFACE is not set
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+# CONFIG_SND_ATMEL_SOC is not set
+# CONFIG_SND_DESIGNWARE_I2S is not set
+CONFIG_SND_SOC_FSL_SAI=y
+# CONFIG_SND_POWERPC_SOC is not set
+# CONFIG_SND_IMX_SOC is not set
+CONFIG_SND_VF610_SOC=y
+CONFIG_SND_SOC_VF610_SGTL5000=y
+CONFIG_SND_SOC_I2C_AND_SPI=y
+CONFIG_SND_SOC_SGTL5000=y
+# CONFIG_SND_SIMPLE_CARD is not set
+# CONFIG_SOUND_PRIME is not set
 
 #
 # HID support
@@ -2037,6 +2244,7 @@ CONFIG_HID_GENERIC=y
 # CONFIG_HID_BELKIN is not set
 # CONFIG_HID_CHERRY is not set
 # CONFIG_HID_CHICONY is not set
+# CONFIG_HID_PRODIKEYS is not set
 # CONFIG_HID_CYPRESS is not set
 # CONFIG_HID_DRAGONRISE is not set
 # CONFIG_HID_EMS_FF is not set
@@ -2069,7 +2277,6 @@ CONFIG_HID_GENERIC=y
 # CONFIG_HID_ROCCAT is not set
 # CONFIG_HID_SAITEK is not set
 # CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SONY is not set
 # CONFIG_HID_SPEEDLINK is not set
 # CONFIG_HID_STEELSERIES is not set
 # CONFIG_HID_SUNPLUS is not set
@@ -2077,10 +2284,7 @@ CONFIG_HID_GENERIC=y
 # CONFIG_HID_SMARTJOYPLUS is not set
 # CONFIG_HID_TIVO is not set
 # CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_THINGM is not set
 # CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_WIIMOTE is not set
 # CONFIG_HID_XINMO is not set
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
@@ -2248,7 +2452,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
-# CONFIG_MMC_ARMMMCI is not set
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER=y
@@ -2266,36 +2469,7 @@ CONFIG_MMC_SDHCI_OF_ESDHC=y
 # CONFIG_MMC_VUB300 is not set
 # CONFIG_MMC_USHC is not set
 # CONFIG_MEMSTICK is not set
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-# CONFIG_LEDS_LM3530 is not set
-# CONFIG_LEDS_LM3642 is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_GPIO is not set
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_LP5523 is not set
-# CONFIG_LEDS_LP5562 is not set
-# CONFIG_LEDS_LP8501 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_DAC124S085 is not set
-CONFIG_LEDS_PWM=y
-# CONFIG_LEDS_BD2802 is not set
-# CONFIG_LEDS_LT3593 is not set
-# CONFIG_LEDS_TCA6507 is not set
-# CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_BLINKM is not set
-
-#
-# LED Triggers
-#
-# CONFIG_LEDS_TRIGGERS is not set
+# CONFIG_NEW_LEDS is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 # CONFIG_EDAC is not set
@@ -2376,8 +2550,6 @@ CONFIG_RTC_DRV_DS3232=y
 # on-CPU RTC drivers
 #
 # CONFIG_RTC_DRV_IMXDI is not set
-# CONFIG_RTC_DRV_PL030 is not set
-# CONFIG_RTC_DRV_PL031 is not set
 # CONFIG_RTC_DRV_MXC is not set
 # CONFIG_RTC_DRV_SNVS is not set
 # CONFIG_RTC_DRV_MOXART is not set
@@ -2392,7 +2564,6 @@ CONFIG_DMADEVICES=y
 #
 # DMA Devices
 #
-# CONFIG_AMBA_PL08X is not set
 # CONFIG_DW_DMAC_CORE is not set
 # CONFIG_DW_DMAC is not set
 # CONFIG_DW_DMAC_PCI is not set
@@ -2400,9 +2571,9 @@ CONFIG_DMADEVICES=y
 CONFIG_MX3_IPU=y
 CONFIG_MX3_IPU_IRQS=4
 # CONFIG_TIMB_DMA is not set
-# CONFIG_PL330_DMA is not set
 # CONFIG_IMX_SDMA is not set
 # CONFIG_IMX_DMA is not set
+# CONFIG_FSL_RAID is not set
 CONFIG_FSL_EDMA=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
@@ -2411,7 +2582,6 @@ CONFIG_DMA_OF=y
 #
 # DMA Clients
 #
-# CONFIG_NET_DMA is not set
 # CONFIG_ASYNC_TX_DMA is not set
 # CONFIG_DMATEST is not set
 # CONFIG_AUXDISPLAY is not set
@@ -2428,6 +2598,16 @@ CONFIG_DMA_OF=y
 # Microsoft Hyper-V guest support
 #
 # CONFIG_STAGING is not set
+CONFIG_FSL_SLEEP_FSM=y
+
+#
+# SOC (System On Chip) specific Drivers
+#
+CONFIG_FSL_SOC_DRIVERS=y
+CONFIG_LS1_SOC_DRIVERS=y
+CONFIG_FTM_ALARM=y
+# CONFIG_FSL_QIXIS is not set
+# CONFIG_QUICC_ENGINE is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -2437,7 +2617,7 @@ CONFIG_COMMON_CLK=y
 #
 # CONFIG_COMMON_CLK_DEBUG is not set
 # CONFIG_COMMON_CLK_SI5351 is not set
-CONFIG_CLK_PPC_CORENET=y
+CONFIG_CLK_QORIQ=y
 
 #
 # Hardware Spinlock drivers
@@ -2466,6 +2646,7 @@ CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 CONFIG_PWM_FSL_FTM=y
 # CONFIG_PWM_IMX is not set
+# CONFIG_PWM_PCA9685 is not set
 CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC=y
 # CONFIG_IPACK_BUS is not set
@@ -2493,6 +2674,7 @@ CONFIG_EXT4_FS=y
 # CONFIG_EXT4_FS_SECURITY is not set
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
@@ -2546,14 +2728,14 @@ CONFIG_NTFS_FS=m
 #
 CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
-# CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_CONFIGFS_FS=m
+CONFIG_CONFIGFS_FS=y
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
@@ -2674,6 +2856,7 @@ CONFIG_NLS_UTF8=y
 # CONFIG_PRINTK_TIME is not set
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_DYNAMIC_DEBUG is not set
 
 #
 # Compile-time checks and compiler options
@@ -2685,10 +2868,9 @@ CONFIG_FRAME_WARN=1024
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_SECTION_MISMATCH=y
-CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
@@ -2724,7 +2906,7 @@ CONFIG_PANIC_ON_OOPS_VALUE=0
 #
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
-CONFIG_DEBUG_SPINLOCK=y
+# CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
@@ -2752,18 +2934,22 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
 
 #
 # Runtime Testing
 #
+# CONFIG_LKDTM is not set
 # CONFIG_TEST_LIST_SORT is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
@@ -2775,27 +2961,16 @@ CONFIG_TRACING_SUPPORT=y
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 # CONFIG_STRICT_DEVMEM is not set
-# CONFIG_ARM_UNWIND is not set
+CONFIG_ARM_UNWIND=y
 # CONFIG_DEBUG_USER is not set
-CONFIG_DEBUG_LL=y
-# CONFIG_DEBUG_LS1021A_LPUART is not set
-# CONFIG_DEBUG_ICEDCC is not set
-# CONFIG_DEBUG_SEMIHOSTING is not set
-CONFIG_DEBUG_LL_UART_8250=y
-# CONFIG_DEBUG_LL_UART_PL01X is not set
+# CONFIG_DEBUG_LL is not set
 CONFIG_DEBUG_IMX_UART_PORT=1
-CONFIG_DEBUG_LL_INCLUDE="debug/8250.S"
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 # CONFIG_DEBUG_UART_PL01X is not set
 # CONFIG_DEBUG_UART_8250 is not set
-CONFIG_DEBUG_UART_PHYS=0x21c0500
-CONFIG_DEBUG_UART_VIRT=0xfe1c0500
-CONFIG_DEBUG_UART_8250_SHIFT=0
-# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set
-CONFIG_DEBUG_UNCOMPRESS=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
-CONFIG_EARLY_PRINTK=y
-# CONFIG_OC_ETM is not set
-# CONFIG_PID_IN_CONTEXTIDR is not set
+# CONFIG_ARM_KPROBES_TEST is not set
+CONFIG_PID_IN_CONTEXTIDR=y
 
 #
 # Security options
@@ -2842,6 +3017,7 @@ CONFIG_CRYPTO_AUTHENC=y
 # CONFIG_CRYPTO_CCM is not set
 # CONFIG_CRYPTO_GCM is not set
 # CONFIG_CRYPTO_SEQIV is not set
+# CONFIG_CRYPTO_TLS is not set
 
 #
 # Block modes
@@ -2925,6 +3101,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_JR=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
 # CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set
 CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
+CONFIG_FSL_CAAM_PKC_SUPPORT=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
 # CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
@@ -2955,6 +3132,7 @@ CONFIG_CRC32_SLICEBY8=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
 # CONFIG_CRC8 is not set
+# CONFIG_CRC64_ECMA is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
diff --git a/recipes-kernel/linux/linux-ls1_3.12.bb b/recipes-kernel/linux/linux-ls1_3.12.bb
index c33485c..eaa0f2a 100644
--- a/recipes-kernel/linux/linux-ls1_3.12.bb
+++ b/recipes-kernel/linux/linux-ls1_3.12.bb
@@ -5,7 +5,7 @@ Layerscape1 Family Boards. "
 require recipes-kernel/linux/linux-ls1.inc
 require recipes-kernel/linux/linux-dtb.inc
 
-SRCBRANCH = "sdk-v1.7.x"
-SRCREV = "6619b8b55796cdf0cec04b66a71288edd3057229"
+SRCBRANCH = "master"
+SRCREV = "f488de6741d5ba805b9fe813d2ddf32368d3a888"
 
 COMPATIBLE_MACHINE = "(ls102xa)"
-- 
1.9.1

[meta-fsl-arm][PATCH v4 02/13] u-boot-ls1: merge u-boot-ls1.inc into recipe

[b28495]

From: Ting Liu <ting.liu@freescale.com>

There is no benefit to having a separate .inc file when we only support one
version of u-boot-ls1.

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 recipes-bsp/u-boot/u-boot-ls1.inc        | 17 -----------------
 recipes-bsp/u-boot/u-boot-ls1_2014.07.bb | 20 ++++++++++++++++++--
 2 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-ls1.inc

diff --git a/recipes-bsp/u-boot/u-boot-ls1.inc b/recipes-bsp/u-boot/u-boot-ls1.inc
deleted file mode 100644
index ccd37c6..0000000
--- a/recipes-bsp/u-boot/u-boot-ls1.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "U-Boot which includes the support for QorIQ Layerscape1 series boards"
-LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1"
-LIC_FILES_CHKSUM = " \
-    file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
-    file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
-    file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
-    file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
-"
-
-SRCBRANCH = "sdk-v1.7.x"
-SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}"
-SRCREV = "659b6a23a8b1f3026200bc6352dbacef53f4dcb1"
-
-LOCALVERSION ?= "-${SRCBRANCH}"
-
-S = "${WORKDIR}/git"
diff --git a/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb b/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
index 010d2cc..ad1dd4b 100644
--- a/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
+++ b/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
@@ -1,9 +1,25 @@
 require recipes-bsp/u-boot/u-boot.inc
-require u-boot-ls1.inc
-inherit fsl-u-boot-localversion
+
+DESCRIPTION = "U-Boot which includes the support for QorIQ Layerscape1 series boards"
+LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1"
+LIC_FILES_CHKSUM = " \
+    file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
+    file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
+    file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+    file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
+"
+
+SRCBRANCH = "sdk-v1.7.x"
+SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}"
+SRCREV = "659b6a23a8b1f3026200bc6352dbacef53f4dcb1"
 
 LOCALVERSION ?= "-${SRCBRANCH}"
 
+S = "${WORKDIR}/git"
+
+inherit fsl-u-boot-localversion
+
 DEPENDS += "change-file-endianess-native"
 PROVIDES += "u-boot"
 
-- 
1.9.1

[meta-fsl-arm][PATCH v4 03/13] u-boot-ls1: update to revision v2015.01-630-g6ba8eed

[b28495]

From: Ting Liu <ting.liu@freescale.com>

Changes:
1. Rebased on git://git.denx.de/u-boot.git v2015.01-487-gab92da9
2. Applied another 143 FSL/backported patches (git log ab92da9..)
3. add DEPENDS on dtc-native as u-boot brings in device tree files
4. use u-boot-with-spl-pbl.bin for nand
5. replace with u-boot-dtb.bin when swapping the image endianness

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 .../u-boot/{u-boot-ls1_2014.07.bb => u-boot-ls1_2015.01.bb} | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
 rename recipes-bsp/u-boot/{u-boot-ls1_2014.07.bb => u-boot-ls1_2015.01.bb} (76%)

diff --git a/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb b/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
similarity index 76%
rename from recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
rename to recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
index ad1dd4b..716105f 100644
--- a/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
+++ b/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
@@ -1,6 +1,6 @@
 require recipes-bsp/u-boot/u-boot.inc
 
-DESCRIPTION = "U-Boot which includes the support for QorIQ Layerscape1 series boards"
+DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ Layerscape1 boards"
 LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1"
 LIC_FILES_CHKSUM = " \
     file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -10,17 +10,17 @@ LIC_FILES_CHKSUM = " \
     file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
 "
 
-SRCBRANCH = "sdk-v1.7.x"
+SRCBRANCH = "master"
 SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}"
-SRCREV = "659b6a23a8b1f3026200bc6352dbacef53f4dcb1"
+SRCREV = "6ba8eedbcdc4b063f59a63e6288b938af739e8ad"
 
-LOCALVERSION ?= "-${SRCBRANCH}"
+LOCALVERSION ?= "+ls1"
 
 S = "${WORKDIR}/git"
 
 inherit fsl-u-boot-localversion
 
-DEPENDS += "change-file-endianess-native"
+DEPENDS += "change-file-endianess-native dtc-native"
 PROVIDES += "u-boot"
 
 do_compile_append () {
@@ -28,9 +28,10 @@ do_compile_append () {
     then
         for config in ${UBOOT_MACHINE}; do
             case "${config}" in
-                *spi*) tclsh ${STAGING_BINDIR_NATIVE}/byte_swap.tcl ${S}/${config}/u-boot.bin ${S}/${config}/u-boot.swap.bin 8
+                *spi*) tclsh ${STAGING_BINDIR_NATIVE}/byte_swap.tcl ${S}/${config}/u-boot-dtb.bin ${S}/${config}/u-boot.swap.bin 8
                 mv ${S}/${config}/u-boot.swap.bin ${S}/u-boot-${type}.${UBOOT_SUFFIX};;
                 *sdcard*)  mv ${S}/${config}/u-boot-with-spl-pbl.bin  ${S}/${config}/u-boot.bin;;
+                *nand*)  mv ${S}/u-boot-with-spl-pbl.bin  ${S}/u-boot.bin;;
             esac
         done
     fi
-- 
1.9.1

[meta-fsl-arm][PATCH v4 04/13] ls1021aqds: remove as it is not supported

[b28495]

From: Ting Liu <ting.liu@freescale.com>

The board is not supported in SDK 1.8 and as it is untested QorIQ team does
not offer support for it. Drop the board to avoid user using untested BSP
components in this board.

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 conf/machine/ls1021aqds.conf | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 conf/machine/ls1021aqds.conf

diff --git a/conf/machine/ls1021aqds.conf b/conf/machine/ls1021aqds.conf
deleted file mode 100644
index ae4d8bd..0000000
--- a/conf/machine/ls1021aqds.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale LS1021AQDS board
-#@SOC: ls102xa
-#@DESCRIPTION: Machine configuration for running LS1021AQDS in 32-bit mode
-#@MAINTAINER: Zhenhua Luo <zhenhua.luo@freescale.com>
-
-require conf/machine/include/ls-base.inc
-require conf/machine/include/tune-cortexa7.inc
-
-SOC_FAMILY = "ls102xa"
-
-UBOOT_CONFIG ??= "nor"
-UBOOT_CONFIG[nor] = "ls1021aqds_nor_config"
-UBOOT_CONFIG[qspi] = "ls1021aqds_qspi_config"
-UBOOT_CONFIG[nor-secboot] = "ls1021aqds_nor_secboot_config"
-UBOOT_CONFIG[lpuart] = "ls1021aqds_lpuart_config"
-UBOOT_CONFIG[sdcard] = "ls1021aqds_sdcard_config"
-
-QE_UCODE="iram_Type_A_LS1021a_r1.0.bin"
-
-KERNEL_DEVICETREE = "ls1021a-qds.dtb"
-
-SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
-SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
-USE_VT ?= "0"
-- 
1.9.1

[meta-fsl-arm][PATCH v4 05/13] ls1021atwr: update lquart/secure-boot UBOOT_CONFIG

[b28495]

From: Ting Liu <ting.liu@freescale.com>

1. config name for lpuart was renamed to ls1021atwr_nor_lpuart_config.
2. add ls1021atwr_nor_SECURE_BOOT_config for secure boot.

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 conf/machine/ls1021atwr.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index c8efba4..916fb4b 100644
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -12,8 +12,9 @@ SOC_FAMILY = "ls102xa"
 UBOOT_CONFIG ??= "nor"
 UBOOT_CONFIG[nor] = "ls1021atwr_nor_config"
 UBOOT_CONFIG[sdcard] = "ls1021atwr_sdcard_config,sdcard"
-UBOOT_CONFIG[lpuart] = "ls1021atwr_lpuart_config"
+UBOOT_CONFIG[lpuart] = "ls1021atwr_nor_lpuart_config"
 UBOOT_CONFIG[qspi] = "ls1021atwr_qspi_config"
+UBOOT_CONFIG[secure-boot] = "ls1021atwr_nor_SECURE_BOOT_config"
 
 QE_UCODE="iram_Type_A_LS1021a_r1.0.bin"
 
-- 
1.9.1

[meta-fsl-arm][PATCH v4 06/13] qemu-fsl: upgrade from v1.7 to v2.2.0

[b28495]

From: Ting Liu <ting.liu@freescale.com>

Update the supported QEMU version from v1.7 to v2.2.0 and include the
Freescale patches on top of this.

Baseline: http://git.qemu.org/?p=qemu.git;a=tag;h=refs/tags/v2.2.0
Freescale patches:
00ac004 QEMU: PPC: Support for VFIO_IOMMU_DUMMY.
58d1cc4 QEMU: PPC: Identity mapped memory support for qemu.
07d4f5f Qemu: PPC: e500: Move CCSR and MMIO space to upper end of address space
a7aee41 QEMU: PPC: e500: Move CCSR definition to params
fbcc0ca vfio-pci: add direct pci device assignment for fsl powerpc
536df03 Update Linux Headers from 3.18
ee367e4 QEMU:Add support for e5500 core revision v102.1 present on T1024 SOC.
b0c2f44 hw/arm/virt: Use memory_region_allocate_system_memory to allocate memory
b2f233e PPC: add e6500 cpu class
694c39a QEMU: PPC: set default cpu type to be 'host'
1572872 QEMU: PPC: specify PVRs for all e500 cores

Also fix indent.

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 recipes-devtools/qemu/qemu-fsl_git.bb | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/recipes-devtools/qemu/qemu-fsl_git.bb b/recipes-devtools/qemu/qemu-fsl_git.bb
index ca36c3d..94fb9b1 100644
--- a/recipes-devtools/qemu/qemu-fsl_git.bb
+++ b/recipes-devtools/qemu/qemu-fsl_git.bb
@@ -3,20 +3,17 @@ require recipes-devtools/qemu/qemu.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                     file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
 
-# This means QEMU v1.7 with FSL specific patches applied
-PV = "1.7+${SRCPV}"
+# This means QEMU v2.2.0 with FSL specific patches applied
+PV = "2.2.0+${SRCPV}"
 
-# NOTE: these options are note available in qemu 1.7, but qemu.inc assumes
-# version 2.0+ where they are available. For now we unset them, but we should
-# remove the following lines when upgrading to qemu 2.0+:
-PACKAGECONFIG[quorum] = ""
-PACKAGECONFIG[lzo]    = ""
-PACKAGECONFIG[numa]   = ""
-PACKAGECONFIG[gtk+]   = ""
+# NOTE: this recipe requires poky's qemu.inc which assumes version 2.3
+# where glx enable config option changed to --enable-opengl. For now we
+# restore it, but we should remove the following lines when upgrading
+# to qemu 2.3:
+PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,mesa"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=sdk-v1.7.x \
-"
-SRCREV = "6ac4597c059d35e2737b234747243e56d340f4db"
+SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=master"
+SRCREV = "00ac004143e9fe46944a1885b04268fcd3a95a3a"
 
 S = "${WORKDIR}/git"
 
@@ -26,23 +23,22 @@ inherit pkgconfig
 
 # Append build host pkg-config paths for native target since the host may provide sdl
 do_configure_prepend() {
-        export PKG_CONFIG=${STAGING_DIR_NATIVE}${bindir_native}/pkg-config
+    export PKG_CONFIG=${STAGING_DIR_NATIVE}${bindir_native}/pkg-config
 }
 
 do_configure_append () {
-   if ! grep 'CONFIG_FDT=y' config-host.mak; then
-        echo "CONFIG_RDMA=y" >> config_host_mak
-   fi
+    if ! grep 'CONFIG_FDT=y' config-host.mak; then
+         echo "CONFIG_RDMA=y" >> config_host_mak
+    fi
 }
 
 # gets around qemu.inc trying to install powerpc_rom.bin
 do_install_prepend() {
-	touch ${WORKDIR}/powerpc_rom.bin
+    touch ${WORKDIR}/powerpc_rom.bin
 }
 
 do_install_append() {
-	rm ${WORKDIR}/powerpc_rom.bin
-
+    rm ${WORKDIR}/powerpc_rom.bin
     # Prevent QA warnings about installed ${localstatedir}/run
     if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
 }
-- 
1.9.1

[meta-fsl-arm][PATCH v4 07/13] linux-ls1: package zImage into kernel-image

[b28495]

From: Ting Liu <ting.liu@freescale.com>

When running kvm test on ls1, the guest kernel needs to be zImage format.
This is a known limitation with qumu-fsl v2.2.0 release.

package zImage into kernel-image which can then be installed into rootfs.

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 recipes-kernel/linux/linux-ls1.inc | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/recipes-kernel/linux/linux-ls1.inc b/recipes-kernel/linux/linux-ls1.inc
index cd8398e..08d88f4 100644
--- a/recipes-kernel/linux/linux-ls1.inc
+++ b/recipes-kernel/linux/linux-ls1.inc
@@ -9,5 +9,18 @@ SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;branch=${SRCBRANCH} \
 "
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
+ZIMAGE_BASE_NAME = "zImage-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
 
 S = "${WORKDIR}/git"
+
+do_install_append() {
+    install -m 0644 arch/${ARCH}/boot/zImage ${D}/boot/zImage-${KERNEL_VERSION}
+}
+
+do_deploy_append() {
+    install -m 0644 arch/${ARCH}/boot/zImage ${DEPLOYDIR}/${ZIMAGE_BASE_NAME}.bin
+    ln -sf ${ZIMAGE_BASE_NAME}.bin ${DEPLOYDIR}/zImage-${MACHINE}.bin
+    ln -sf ${ZIMAGE_BASE_NAME}.bin ${DEPLOYDIR}/zImage
+}
+
+FILES_kernel-image += "/boot/zImage*"
-- 
1.9.1

[meta-fsl-arm][PATCH v4 08/13] cst: update to revision 6f57c86

[b28495]

From: Ting Liu <ting.liu@freescale.com>

This imports following changes:

6f57c86 Modify input files comments.
327932d FIX SFP Write Protect Issue
dbc2080 Add support for SFP1.x and SFP2.x in gen_drv utility.
5aa79ec Modify images names in ls1 input files.
b5d442b P3/P5: Input Files for NAND Secure Boot
51dc4a4 Makefile: Build uni_pbi tool
a647f39 CST : Change Alignment offset

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 recipes-devtools/cst/cst_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-devtools/cst/cst_git.bb b/recipes-devtools/cst/cst_git.bb
index 0684a26..08dbd56 100644
--- a/recipes-devtools/cst/cst_git.bb
+++ b/recipes-devtools/cst/cst_git.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "CST Tool"
+DESCRIPTION = "utility for security boot"
 SECTION = "cst"
 LICENSE = "BSD"
 
@@ -9,8 +9,8 @@ DEPENDS += "openssl"
 
 inherit kernel-arch
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/cst.git;branch=sdk-v1.7.x"
-SRCREV = "2d35e98539c0daa2bc8049e3bd44994d3d93bbe7"
+SRC_URI = "git://git.freescale.com/ppc/sdk/cst.git;branch=master"
+SRCREV = "6f57c86c93cab0f4d0a40d83b685afa6932a6301"
 
 S = "${WORKDIR}/git"
 
-- 
1.9.1

[meta-fsl-arm][PATCH v4 09/13] rcw: update to revision 426f7a6

[b28495]

From: Ting Liu <ting.liu@freescale.com>

This imports following changes:

426f7a6 SECURE BOOT: Add missing RCW's for T4240QDS
756454f SECURE BOOT: Rename the RCW's
7782087 SECURE BOOT: Remove Unwanted RCW's
e93c210 LS1021: Unset BOOT_HO bit in rcw.
4375fc4 t1023rdb: update IFC_MODE to 0x2F for errata A-009138
5cf9bc5 T4240QDS: Add four 1800MHz/Core RCW files for T4240QDS board
cff536a t1023rdb: set RTC=1 to enable GPIO1[14]
a5983f2 T4240RDB: Add one new RCW for T4240RDB board
3a6ae48 ls1021a: fix some serdes settings for SATA
31078e1 ls1021atwr: do not power down PLL which is used by SATA
c6d72e3 t2080qds: rcw: Add eMMC DDR mode RCW
c77415c T104xD4RDB: update SRDS_PLL_REF_CLK_SEL_S1 value
e2c0844 ls1021atwr: add USB 2.0 support
fd0c1df p5020/p5040: NAND Secure Boot RCW added with PBI commands
259d57d t1023rdb: add rcw for t1023rdb board
c3ab906 T1042: Add t1042d4rdb rcw files for serdes protocol 0x86
ae39560 T1040: Add t1040d4rdb rcw files for serdes protocol 0x66
b9d3c22 p3041: NAND Secure Boot RCW added with PBI commands
dc0fad9 t2080rdb: update ddr to 1866MT/s
03c5ee6 t2080: update platform clock to 600MHz
72945fa rcw: ls102xa: merge rcw for lpuart and dcu
6678741 rcw: ls102xa: Adjust the features supported in SD boot
f7a54c1 arm: ls102xa: Increase IO drive strength for LS1021AQDS board
3dd07fa B4860-As-B3: Add two new RCW files
69a041c B4860QDS: Add HWA_CGA_M3_CLK_SEL bits define in b4860.rcwi file
87289d5 ls102xa: rcw: Add QSPI boot RCW for LS1021A TWR board
13bf692 t1024: update FM1_MAC_RAT from 0 to 1
5b94b3e t1024rdb: add new rcw 0x135 and minor update

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 .../rcw/rcw/rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch    | 2 +-
 recipes-bsp/rcw/rcw_git.bb                                          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-bsp/rcw/rcw/rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch b/recipes-bsp/rcw/rcw/rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch
index 51f6eeb..49d99fc 100644
--- a/recipes-bsp/rcw/rcw/rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch
+++ b/recipes-bsp/rcw/rcw/rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch
@@ -27,7 +27,7 @@ index 6ec1697..0f94293 100644
 +BOARDS ?= b4420qds b4860qds \
  	 ls1021aqds ls1021atwr \
  	 p2041rdb p3041ds p4080ds p5020ds p5040ds \
- 	 t1040rdb t1042rdb t1042rdb_pi t1040qds t2080rdb t2080qds t2081qds t4240qds t4240rdb
+ 	 t1024qds t1023rdb t1024rdb t1040rdb t1042rdb t1042rdb_pi t1040qds \
 diff --git a/Makefile.inc b/Makefile.inc
 index 4cadb2e..6e8b78f 100644
 --- a/Makefile.inc
diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index 7e77ab3..2a03309 100644
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -7,8 +7,8 @@ DEPENDS += "change-file-endianess-native"
 
 inherit deploy
 
-SRCBRANCH = "sdk-v1.7.x"
-SRCREV = "3e89f378ed70e9b856756de8c3dbdfccb045fa0c"
+SRCBRANCH = "master"
+SRCREV = "426f7a6535d93dac76f5125035e0938a85e778d2"
 SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git;branch=${SRCBRANCH} \
     file://rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch \
 "
@@ -18,7 +18,7 @@ S = "${WORKDIR}/git"
 EXTRA_OEMAKE = "BOARDS=${@d.getVar('MACHINE', True).replace('-64b','')} DESTDIR=${D}/boot/rcw/"
 
 do_install () {
-    oe_runmake install 
+    oe_runmake install
 }
 
 do_deploy () {
-- 
1.9.1

[meta-fsl-arm][PATCH v4 10/13] asf: update to revision 62ba10a

[b28495]

From: Ting Liu <ting.liu@freescale.com>

This imports following changes:

62ba10a asf_fmc: Patch to update the name of xml files.
8d744dd asf: Patch to fix ipv6 issue on dpaa.
ddf9678 asf: Patch to return jumbo packet back.
dcda291 asf: Patch to include caam_jr_strstatus in ASF_IPSEC_DEBUG mode.
49f591f asf: Patch to change function signature caam_jr_strstatus
f860eff ipsecproc: Patch to fix display of ipsec stats.
461586d ASFIPSEC: fix compilation for SEC 3.x when ASF_IPSEC_DEBUG is defined
03b9bad asf: Patch to fix sha256 issue.
a21b2d7 Removing Ethernet padding in abuf to skb conversion
a03283d4 Aligning function ASFFFPProcessAndSendFD and ASFFFPProcessAndSendPkt while validating flows

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 openembedded-layer/recipes-kernel/asf/asf_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openembedded-layer/recipes-kernel/asf/asf_git.bb b/openembedded-layer/recipes-kernel/asf/asf_git.bb
index 71eb46b..bc8dcbc 100644
--- a/openembedded-layer/recipes-kernel/asf/asf_git.bb
+++ b/openembedded-layer/recipes-kernel/asf/asf_git.bb
@@ -3,8 +3,8 @@ SECTION = "asf"
 LICENSE = "GPLv2 & GPLv2+ & BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b5881ecf398da8a03a3f4c501e29d287"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/asf.git;branch=sdk-v1.7.x"
-SRCREV = "16eb472d6b2b34c8b605a86c469611bc8ddec1c9"
+SRC_URI = "git://git.freescale.com/ppc/sdk/asf.git;branch=master"
+SRCREV = "62ba10ab6bab8f8f53934e4bb55b5a552bf3fd6b"
 
 inherit module
 
-- 
1.9.1

[meta-fsl-arm][PATCH v4 11/13] asf: use KBUILD_OUTPUT to point to build-artifacts

[b28495]

From: Ting Liu <ting.liu@freescale.com>

In poky commit 46cdaf1, the kernel build output was put into
kernel-build-artifacts, and kernel-source is kept "pristine".

KERNEL_PATH points to kernel-source, while KBUILD_OUTPUT points
to build-artifacts which can be used for external module build.

asf Makefile tries to include the .config, use KBUILD_OUTPUT to
avoid build error.

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 openembedded-layer/recipes-kernel/asf/asf_git.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/openembedded-layer/recipes-kernel/asf/asf_git.bb b/openembedded-layer/recipes-kernel/asf/asf_git.bb
index bc8dcbc..7cf8f57 100644
--- a/openembedded-layer/recipes-kernel/asf/asf_git.bb
+++ b/openembedded-layer/recipes-kernel/asf/asf_git.bb
@@ -15,6 +15,12 @@ export KERNEL_PATH = "${STAGING_KERNEL_DIR}"
 
 INHIBIT_PACKAGE_STRIP = "1"
 
+do_configure[depends] += "virtual/kernel:do_shared_workdir"
+do_configure_prepend () {
+    find ${S} -name Makefile -exec \
+        sed -i 's,$(KERNEL_PATH)/.config,$(KBUILD_OUTPUT)/.config,' {} \;
+}
+
 do_install(){
 	mkdir -p ${D}/${libexecdir} 
 	mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/asf
-- 
1.9.1

[meta-fsl-arm][PATCH v4 12/13] rename ls-base.inc -> qoriq-arm.inc

[b28495]

From: Ting Liu <ting.liu@freescale.com>

Preparation for next merge stage with qoriq-ppc.

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 conf/machine/include/{ls-base.inc => qoriq-arm.inc} | 0
 conf/machine/ls1021atwr.conf                        | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename conf/machine/include/{ls-base.inc => qoriq-arm.inc} (100%)

diff --git a/conf/machine/include/ls-base.inc b/conf/machine/include/qoriq-arm.inc
similarity index 100%
rename from conf/machine/include/ls-base.inc
rename to conf/machine/include/qoriq-arm.inc
diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index 916fb4b..4478e95 100644
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running LS1021ATWR in 32-bit mode
 #@MAINTAINER: Zhenhua Luo <zhenhua.luo@freescale.com>
 
-require conf/machine/include/ls-base.inc
+require conf/machine/include/qoriq-arm.inc
 require conf/machine/include/tune-cortexa7.inc
 
 SOC_FAMILY = "ls102xa"
-- 
1.9.1

[meta-fsl-arm][PATCH v4 13/13] layer.conf: include layer-specific bb files

[b28495]

From: Ting Liu <ting.liu@freescale.com>

Previously layer-specific bbappends are applied when that layer
is included in the configuration.

There is layer-specific bb files too (like asf_git.bb). Apply the
same rule here.

Signed-off-by: Ting Liu <ting.liu@freescale.com>
---
 conf/layer.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/layer.conf b/conf/layer.conf
index e260e62..81d29f5 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -21,3 +21,6 @@ ${FSL_MIRROR}	http://download.ossystems.com.br/bsp/freescale/source/ \n \
 # layer is included in our configuration
 BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
                for layer in BBFILE_COLLECTIONS.split())}"
+# Add layer-specific bb files too
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bb' % layer \
+               for layer in BBFILE_COLLECTIONS.split())}"
-- 
1.9.1