[meta-lsi] [PATCH 10/86] linux-yocto: Recipe updates for 7.8.1.7 Kernel tag
Daniel Dragomir
daniel.dragomir at windriver.com
Wed Oct 29 08:35:18 PDT 2014
From: Paul Butler <paul.butler at windriver.com>
- Updates to custom build recipes for 7.8.1.7 tag
- Removed unnecessary inc files that only had a branch name
- Updated defconfigs for 7.8.1.7 kernel tag
Signed-off-by: Paul Butler <paul.butler at windriver.com>
---
recipes-kernel/linux/linux-yocto-custom-rt.bb | 18 ++--
.../linux-3.4/axm5500sim/axm5500sim.inc | 1 -
.../linux-3.4/axm5500sim/defconfig | 19 +++-
.../linux-3.4/elpaso/defconfig | 105 ++++++++++-----------
.../linux-3.4/elpaso/elpaso.inc | 1 -
recipes-kernel/linux/linux-yocto-custom.bb | 18 ++--
.../linux-3.4/axm5500sim/axm5500sim.inc | 1 -
.../linux-3.4/axm5500sim/defconfig | 19 +++-
.../linux-yocto-custom/linux-3.4/elpaso/defconfig | 92 +++++++++---------
.../linux-yocto-custom/linux-3.4/elpaso/elpaso.inc | 1 -
recipes-kernel/linux/linux-yocto_3.4.bbappend | 10 +-
recipes-kernel/linux/linux-yocto_3.4.inc | 4 +-
12 files changed, 155 insertions(+), 134 deletions(-)
delete mode 100644 recipes-kernel/linux/linux-yocto-custom-rt/linux-3.4/axm5500sim/axm5500sim.inc
delete mode 100644 recipes-kernel/linux/linux-yocto-custom-rt/linux-3.4/elpaso/elpaso.inc
delete mode 100644 recipes-kernel/linux/linux-yocto-custom/linux-3.4/axm5500sim/axm5500sim.inc
delete mode 100644 recipes-kernel/linux/linux-yocto-custom/linux-3.4/elpaso/elpaso.inc
diff --git a/recipes-kernel/linux/linux-yocto-custom-rt.bb b/recipes-kernel/linux/linux-yocto-custom-rt.bb
index 737c4e8..da60089 100644
--- a/recipes-kernel/linux/linux-yocto-custom-rt.bb
+++ b/recipes-kernel/linux/linux-yocto-custom-rt.bb
@@ -3,22 +3,24 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.4/${MACHINE}:"
inherit kernel
require recipes-kernel/linux/linux-yocto.inc
-require ${PN}/linux-3.4/${MACHINE}/${MACHINE}.inc
+KBRANCH_${MACHINE} = "standard/preempt-rt/lsi/base"
# for local repo
-#KSRC_linux_custom ?= "/home/pbutler/work/repos/lsi_axxia_yocto_public/"
-#SRC_URI_${MACHINE} ?= "git://${KSRC_linux_custom};protocol=file;bareclone=1;branch=${KBRANCH}"
+#KSRC_linux_custom = "/home/pbutler/work/repos/lsi_axxia_yocto_public/"
+#SRC_URI_${MACHINE} = "git://${KSRC_linux_custom};protocol=file;bareclone=1;branch=${KBRANCH}"
# for gtihub repo
-KSRC_linux_custom ?= "github.com/lsigithub/lsi_axxia_yocto_public.git"
-SRC_URI_${MACHINE} ?= "git://${KSRC_linux_custom};bareclone=1;branch=${KBRANCH}"
+KSRC_linux_custom = "github.com/lsigithub/lsi_axxia_yocto_public.git"
+SRC_URI_${MACHINE} = "git://${KSRC_linux_custom};bareclone=1;branch=${KBRANCH}"
SRC_URI_${MACHINE} += "file://defconfig"
-SRCREV="${AUTOREV}"
-LINUX_VERSION ?= "3.4.28"
+SRCREV = "lsi_axxia_linux_preempt-rt_7.8.1.7"
+#SRCREV="${AUTOREV}"
+
+LINUX_VERSION = "3.4.43"
LINUX_VERSION_EXTENSION = "-custom"
PR = "r0"
-PV = "${LINUX_VERSION}+git${SRCPV}"
+PV = "${LINUX_VERSION}+${SRCREV}"
diff --git a/recipes-kernel/linux/linux-yocto-custom-rt/linux-3.4/axm5500sim/axm5500sim.inc b/recipes-kernel/linux/linux-yocto-custom-rt/linux-3.4/axm5500sim/axm5500sim.inc
deleted file mode 100644
index 9df59f3..0000000
--- a/recipes-kernel/linux/linux-yocto-custom-rt/linux-3.4/axm5500sim/axm5500sim.inc
+++ /dev/null
@@ -1 +0,0 @@
-KBRANCH_${MACHINE} = "standard/preempt-rt/lsi/axm55xx"
diff --git a/recipes-kernel/linux/linux-yocto-custom-rt/linux-3.4/axm5500sim/defconfig b/recipes-kernel/linux/linux-yocto-custom-rt/linux-3.4/axm5500sim/defconfig
index e65f50c..c67904a 100644
--- a/recipes-kernel/linux/linux-yocto-custom-rt/linux-3.4/axm5500sim/defconfig
+++ b/recipes-kernel/linux/linux-yocto-custom-rt/linux-3.4/axm5500sim/defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.4.28 Kernel Configuration
+# Linux/arm 3.4.43 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -305,6 +305,7 @@ CONFIG_ARCH_AXXIA=y
#
CONFIG_ARCH_AXXIA_GIC=y
CONFIG_ARCH_AXXIA_DT=y
+CONFIG_ARCH_AXXIA_SIM=y
CONFIG_ARM_TIMER_SP804=y
#
@@ -746,7 +747,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
# CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_UB is not set
# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_ISS is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_MG_DISK is not set
@@ -778,6 +778,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
# CONFIG_BMP085 is not set
# CONFIG_PCH_PHUB is not set
# CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_LSI_MTC is not set
# CONFIG_C2PORT is not set
#
@@ -1045,6 +1046,7 @@ CONFIG_NET_VENDOR_CIRRUS=y
CONFIG_NET_VENDOR_CISCO=y
# CONFIG_ENIC is not set
# CONFIG_DM9000 is not set
+# CONFIG_LSI_NET is not set
# CONFIG_DNET is not set
CONFIG_NET_VENDOR_DEC=y
# CONFIG_NET_TULIP is not set
@@ -1163,7 +1165,6 @@ CONFIG_PHYLIB=y
#
# CONFIG_WAN is not set
# CONFIG_VMXNET3 is not set
-# CONFIG_LSI_NET is not set
# CONFIG_ISDN is not set
#
@@ -1820,6 +1821,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
#
# USB Host Controller Drivers
#
+CONFIG_LSI_USB_SW_WORKAROUND=y
# CONFIG_USB_C67X00_HCD is not set
# CONFIG_USB_XHCI_HCD is not set
# CONFIG_USB_EHCI_HCD is not set
@@ -2018,10 +2020,20 @@ CONFIG_DMADEVICES=y
#
# DMA Devices
#
+CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
# CONFIG_AMBA_PL08X is not set
# CONFIG_DW_DMAC is not set
+CONFIG_LSI_DMA=y
# CONFIG_TIMB_DMA is not set
# CONFIG_PL330_DMA is not set
+CONFIG_DMA_ENGINE=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
# CONFIG_UIO is not set
@@ -2061,6 +2073,7 @@ CONFIG_CLKSRC_MMIO=y
#
# CONFIG_VIRT_DRIVERS is not set
# CONFIG_PM_DEVFREQ is not set
+CONFIG_IRQCHIP=y
#
# File systems
diff --git a/recipes-kernel/linux/linux-yocto-custom-rt/linux-3.4/elpaso/defconfig b/recipes-kernel/linux/linux-yocto-custom-rt/linux-3.4/elpaso/defconfig
index 6728ac0..418c909 100644
--- a/recipes-kernel/linux/linux-yocto-custom-rt/linux-3.4/elpaso/defconfig
+++ b/recipes-kernel/linux/linux-yocto-custom-rt/linux-3.4/elpaso/defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.4.28 Kernel Configuration
+# Linux/powerpc 3.4.43 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -55,8 +55,7 @@ CONFIG_GENERIC_NVRAM=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_PPC_OF=y
-# CONFIG_PPC_UDBG_16550 is not set
-CONFIG_PPC_UDBG_ARM_AMBA=y
+CONFIG_PPC_UDBG_16550=y
CONFIG_GENERIC_TBSYNC=y
CONFIG_AUDIT_ARCH=y
CONFIG_GENERIC_BUG=y
@@ -252,10 +251,10 @@ CONFIG_DEFAULT_IOSCHED="cfq"
# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-CONFIG_FREEZER=y
+# CONFIG_FREEZER is not set
+CONFIG_LSI_PPC_PCI=y
CONFIG_PPC4xx_PCI_EXPRESS=y
# CONFIG_PPC4xx_MSI is not set
-CONFIG_ACP3400_PCI_4xx=y
CONFIG_PPC_MSI_BITMAP=y
# CONFIG_PPC_XICS is not set
# CONFIG_PPC_ICP_NATIVE is not set
@@ -290,21 +289,9 @@ CONFIG_PPC_47x=y
CONFIG_ELPASO=y
# CONFIG_ICON is not set
CONFIG_ACP=y
-# CONFIG_ACPISS is not set
-# CONFIG_ACP3400_DUS is not set
-# CONFIG_ACP3400_DUS_TB is not set
-# CONFIG_ACP3400_DUW2 is not set
-# CONFIG_ACP3400_TP1 is not set
-# CONFIG_ACP3400_TP5 is not set
-# CONFIG_ACP3400_DUW31 is not set
# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
# CONFIG_PPC44x_SIMPLE is not set
# CONFIG_PPC4xx_GPIO is not set
-CONFIG_ACP3400_GPIO=y
-# CONFIG_PCA9554_GPIO is not set
-CONFIG_ACP3400_I2C=y
-CONFIG_ACP3400_SSP=y
-CONFIG_ACP_PCIE_HOTPLUG=y
CONFIG_440GP=y
# CONFIG_PPC_WSP is not set
# CONFIG_KVM_GUEST is not set
@@ -360,11 +347,11 @@ CONFIG_BINFMT_ELF=y
# CONFIG_MATH_EMULATION is not set
# CONFIG_IOMMU_HELPER is not set
# CONFIG_SWIOTLB is not set
-CONFIG_HOTPLUG_CPU=y
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
CONFIG_ARCH_HAS_WALK_MEMORY=y
CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
# CONFIG_IRQ_ALL_CPUS is not set
CONFIG_MAX_ACTIVE_REGIONS=32
CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -393,15 +380,9 @@ CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="console=ttyS0 mtdparts=acp-nand:512K(2ndStage),512K(env-0),512K(env-1),512K(3rdStage),-(fs) ip=dhcp root=/dev/nfs"
CONFIG_EXTRA_TARGETS=""
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND is not set
# CONFIG_HIBERNATION is not set
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
# CONFIG_PM_RUNTIME is not set
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_CLK=y
CONFIG_SECCOMP=y
CONFIG_ISA_DMA_API=y
@@ -413,7 +394,6 @@ CONFIG_ZONE_DMA=y
CONFIG_NEED_SG_DMA_LENGTH=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_PPC_INDIRECT_PCI=y
-CONFIG_PPC4xx_CPM=y
CONFIG_4xx_SOC=y
CONFIG_PPC_PCI_CHOICE=y
CONFIG_PCI=y
@@ -438,23 +418,10 @@ CONFIG_PCI_DEBUG=y
# CONFIG_HOTPLUG_PCI is not set
CONFIG_HAS_RAPIDIO=y
CONFIG_RAPIDIO=y
-CONFIG_ACP3400_RIO=y
-CONFIG_RIO_MAX_IRQS=0x20
-CONFIG_ACP_RIO_STAT=y
-# CONFIG_SRIO_IRQ_TIME is not set
-# CONFIG_ACP_RIO_16B_ID is not set
-CONFIG_ACP_RIO_DEBUG=y
# CONFIG_FSL_RIO is not set
-CONFIG_RIO_MAINT_WIN_SIZE=0x1000000
# CONFIG_RAPIDIO_TSI721 is not set
CONFIG_RAPIDIO_DISC_TIMEOUT=10
CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y
-# CONFIG_RAPIDIO_DIO_DMA is not set
-CONFIG_RAPIDIO_ACCESS_ERR_LIMIT=0
-# CONFIG_RAPIDIO_DYNAMIC_ROUTES is not set
-# CONFIG_RAPIDIO_MULTICAST_PW is not set
-# CONFIG_RAPIDIO_HOTPLUG is not set
-# CONFIG_RAPIDIO_STATIC_DESTID is not set
CONFIG_RAPIDIO_DEBUG=y
# CONFIG_RAPIDIO_TSI57X is not set
CONFIG_RAPIDIO_CPS_XX=y
@@ -475,6 +442,7 @@ CONFIG_PAGE_OFFSET_BOOL=y
CONFIG_PAGE_OFFSET=0xa0000000
CONFIG_KERNEL_START_BOOL=y
CONFIG_KERNEL_START=0xa0400000
+CONFIG_PHYSICAL_START_BOOL=y
CONFIG_PHYSICAL_START=0x400000
CONFIG_TASK_SIZE_BOOL=y
CONFIG_TASK_SIZE=0xa0000000
@@ -766,6 +734,7 @@ CONFIG_OF_DEVICE=y
CONFIG_OF_GPIO=y
CONFIG_OF_I2C=y
CONFIG_OF_NET=y
+CONFIG_OF_MDIO=y
CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y
CONFIG_OF_MTD=y
@@ -791,7 +760,6 @@ CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=35000
# CONFIG_BLK_DEV_XIP is not set
-# CONFIG_BLK_DEV_ISS is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_XILINX_SYSACE is not set
@@ -1022,6 +990,13 @@ CONFIG_NET_VENDOR_CHELSIO=y
# CONFIG_CHELSIO_T4VF is not set
CONFIG_NET_VENDOR_CISCO=y
# CONFIG_ENIC is not set
+CONFIG_LSI_NET=y
+CONFIG_LSI_NET_NUM_RX_DESC=4
+CONFIG_LSI_NET_RX_BUF_SZ=32768
+CONFIG_LSI_NET_NUM_TX_DESC=4
+CONFIG_LSI_NET_TX_BUF_SZ=32768
+CONFIG_DISABLE_TX_INTERRUPTS=y
+# CONFIG_PRELOAD_RX_BUFFERS is not set
# CONFIG_DNET is not set
CONFIG_NET_VENDOR_DEC=y
# CONFIG_NET_TULIP is not set
@@ -1126,7 +1101,28 @@ CONFIG_NET_VENDOR_XILINX=y
# CONFIG_XILINX_LL_TEMAC is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
-# CONFIG_PHYLIB is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_AMD_PHY is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_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_PPP is not set
# CONFIG_SLIP is not set
# CONFIG_TR is not set
@@ -1152,11 +1148,6 @@ CONFIG_USB_ZD1201=y
#
# CONFIG_WAN is not set
# CONFIG_VMXNET3 is not set
-CONFIG_LSI_NET=y
-CONFIG_LSI_NET_NUM_RX_DESC=4
-CONFIG_LSI_NET_RX_BUF_SZ=32768
-CONFIG_LSI_NET_NUM_TX_DESC=4
-CONFIG_LSI_NET_TX_BUF_SZ=32768
# CONFIG_ISDN is not set
#
@@ -1244,7 +1235,6 @@ CONFIG_SERIO_LIBPS2=y
CONFIG_VT=y
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
CONFIG_HW_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set
CONFIG_UNIX98_PTYS=y
@@ -1298,7 +1288,6 @@ CONFIG_I2C_COMPAT=y
CONFIG_I2C_CHARDEV=y
# CONFIG_I2C_MUX is not set
CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOBIT=y
#
# I2C Hardware Bus support
@@ -1350,7 +1339,8 @@ CONFIG_I2C_ALGOBIT=y
# Other I2C/SMBus bus drivers
#
# CONFIG_I2C_STUB is not set
-CONFIG_I2C_AXXIA=y
+# CONFIG_I2C_AXXIA is not set
+CONFIG_ACP3400_I2C=y
CONFIG_I2C_DEBUG_CORE=y
CONFIG_I2C_DEBUG_ALGO=y
CONFIG_I2C_DEBUG_BUS=y
@@ -1382,6 +1372,7 @@ CONFIG_GPIOLIB=y
# Memory mapped GPIO drivers:
#
# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_PL061 is not set
# CONFIG_GPIO_XILINX is not set
# CONFIG_GPIO_VX855 is not set
@@ -1575,6 +1566,7 @@ CONFIG_USB_MON=y
#
# USB Host Controller Drivers
#
+CONFIG_LSI_USB_SW_WORKAROUND=y
# CONFIG_USB_C67X00_HCD is not set
# CONFIG_USB_XHCI_HCD is not set
CONFIG_USB_EHCI_HCD=y
@@ -1684,7 +1676,7 @@ CONFIG_DMADEVICES=y
#
CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
# CONFIG_DW_DMAC is not set
-CONFIG_ACP_GPDMA=y
+CONFIG_LSI_DMA=y
# CONFIG_TIMB_DMA is not set
CONFIG_DMA_ENGINE=y
@@ -1713,7 +1705,6 @@ CONFIG_DMA_ENGINE=y
# Hardware Spinlock drivers
#
CONFIG_IOMMU_SUPPORT=y
-# CONFIG_SHMOBILE_IOMMU is not set
#
# Remoteproc drivers (EXPERIMENTAL)
@@ -1724,6 +1715,7 @@ CONFIG_IOMMU_SUPPORT=y
#
# CONFIG_VIRT_DRIVERS is not set
# CONFIG_PM_DEVFREQ is not set
+CONFIG_IRQCHIP=y
#
# File systems
@@ -1880,6 +1872,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NLS_KOI8_U is not set
# CONFIG_NLS_UTF8 is not set
+# CONFIG_VMFS_FS is not set
# CONFIG_BINARY_PRINTF is not set
#
@@ -1974,7 +1967,6 @@ CONFIG_RCU_CPU_STALL_VERBOSE=y
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_LKDTM is not set
-# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
# CONFIG_FAULT_INJECTION is not set
# CONFIG_LATENCYTOP is not set
# CONFIG_DEBUG_PAGEALLOC is not set
@@ -2019,11 +2011,10 @@ CONFIG_XMON_DISASSEMBLY=y
CONFIG_DEBUGGER=y
# CONFIG_BDI_SWITCH is not set
CONFIG_PPC_EARLY_DEBUG=y
-# CONFIG_PPC_EARLY_DEBUG_44x is not set
-CONFIG_PPC_EARLY_DEBUG_AXXIA=y
+CONFIG_PPC_EARLY_DEBUG_44x=y
+CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0x40000200
+CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
CONFIG_STRICT_DEVMEM=y
-CONFIG_PPC_EARLY_DBG_AXXIA_PHYSLOW=0x00400000
-CONFIG_PPC_EARLY_DBG_AXXIA_PHYSHIGH=0x20
#
# Security options
diff --git a/recipes-kernel/linux/linux-yocto-custom-rt/linux-3.4/elpaso/elpaso.inc b/recipes-kernel/linux/linux-yocto-custom-rt/linux-3.4/elpaso/elpaso.inc
deleted file mode 100644
index 9388d2b..0000000
--- a/recipes-kernel/linux/linux-yocto-custom-rt/linux-3.4/elpaso/elpaso.inc
+++ /dev/null
@@ -1 +0,0 @@
-KBRANCH_${MACHINE} = "standard/preempt-rt/lsi/acp34xx"
diff --git a/recipes-kernel/linux/linux-yocto-custom.bb b/recipes-kernel/linux/linux-yocto-custom.bb
index 737c4e8..7bc20ad 100644
--- a/recipes-kernel/linux/linux-yocto-custom.bb
+++ b/recipes-kernel/linux/linux-yocto-custom.bb
@@ -3,22 +3,24 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.4/${MACHINE}:"
inherit kernel
require recipes-kernel/linux/linux-yocto.inc
-require ${PN}/linux-3.4/${MACHINE}/${MACHINE}.inc
+KBRANCH_${MACHINE} = "standard/lsi/base"
# for local repo
-#KSRC_linux_custom ?= "/home/pbutler/work/repos/lsi_axxia_yocto_public/"
-#SRC_URI_${MACHINE} ?= "git://${KSRC_linux_custom};protocol=file;bareclone=1;branch=${KBRANCH}"
+#KSRC_linux_custom = "/home/pbutler/work/repos/lsi_axxia_yocto_public/"
+#SRC_URI_${MACHINE} = "git://${KSRC_linux_custom};protocol=file;bareclone=1;branch=${KBRANCH}"
# for gtihub repo
-KSRC_linux_custom ?= "github.com/lsigithub/lsi_axxia_yocto_public.git"
-SRC_URI_${MACHINE} ?= "git://${KSRC_linux_custom};bareclone=1;branch=${KBRANCH}"
+KSRC_linux_custom = "github.com/lsigithub/lsi_axxia_yocto_public.git"
+SRC_URI_${MACHINE} = "git://${KSRC_linux_custom};bareclone=1;branch=${KBRANCH}"
SRC_URI_${MACHINE} += "file://defconfig"
-SRCREV="${AUTOREV}"
-LINUX_VERSION ?= "3.4.28"
+SRCREV = "lsi_axxia_linux_7.8.1.7"
+#SRCREV="${AUTOREV}"
+
+LINUX_VERSION = "3.4.43"
LINUX_VERSION_EXTENSION = "-custom"
PR = "r0"
-PV = "${LINUX_VERSION}+git${SRCPV}"
+PV = "${LINUX_VERSION}+${SRCREV}"
diff --git a/recipes-kernel/linux/linux-yocto-custom/linux-3.4/axm5500sim/axm5500sim.inc b/recipes-kernel/linux/linux-yocto-custom/linux-3.4/axm5500sim/axm5500sim.inc
deleted file mode 100644
index cc534fc..0000000
--- a/recipes-kernel/linux/linux-yocto-custom/linux-3.4/axm5500sim/axm5500sim.inc
+++ /dev/null
@@ -1 +0,0 @@
-KBRANCH_${MACHINE} = "standard/lsi/axm55xx"
diff --git a/recipes-kernel/linux/linux-yocto-custom/linux-3.4/axm5500sim/defconfig b/recipes-kernel/linux/linux-yocto-custom/linux-3.4/axm5500sim/defconfig
index 04b737a..fee9c5c 100644
--- a/recipes-kernel/linux/linux-yocto-custom/linux-3.4/axm5500sim/defconfig
+++ b/recipes-kernel/linux/linux-yocto-custom/linux-3.4/axm5500sim/defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.4.28 Kernel Configuration
+# Linux/arm 3.4.43 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -306,6 +306,7 @@ CONFIG_ARCH_AXXIA=y
#
CONFIG_ARCH_AXXIA_GIC=y
CONFIG_ARCH_AXXIA_DT=y
+CONFIG_ARCH_AXXIA_SIM=y
CONFIG_ARM_TIMER_SP804=y
#
@@ -744,7 +745,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
# CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_UB is not set
# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_ISS is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_MG_DISK is not set
@@ -776,6 +776,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
# CONFIG_BMP085 is not set
# CONFIG_PCH_PHUB is not set
# CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_LSI_MTC is not set
# CONFIG_C2PORT is not set
#
@@ -1044,6 +1045,7 @@ CONFIG_NET_VENDOR_CIRRUS=y
CONFIG_NET_VENDOR_CISCO=y
# CONFIG_ENIC is not set
# CONFIG_DM9000 is not set
+# CONFIG_LSI_NET is not set
# CONFIG_DNET is not set
CONFIG_NET_VENDOR_DEC=y
# CONFIG_NET_TULIP is not set
@@ -1162,7 +1164,6 @@ CONFIG_PHYLIB=y
#
# CONFIG_WAN is not set
# CONFIG_VMXNET3 is not set
-# CONFIG_LSI_NET is not set
# CONFIG_ISDN is not set
#
@@ -1819,6 +1820,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
#
# USB Host Controller Drivers
#
+CONFIG_LSI_USB_SW_WORKAROUND=y
# CONFIG_USB_C67X00_HCD is not set
# CONFIG_USB_XHCI_HCD is not set
# CONFIG_USB_EHCI_HCD is not set
@@ -2017,10 +2019,20 @@ CONFIG_DMADEVICES=y
#
# DMA Devices
#
+CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
# CONFIG_AMBA_PL08X is not set
# CONFIG_DW_DMAC is not set
+CONFIG_LSI_DMA=y
# CONFIG_TIMB_DMA is not set
# CONFIG_PL330_DMA is not set
+CONFIG_DMA_ENGINE=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
# CONFIG_UIO is not set
@@ -2060,6 +2072,7 @@ CONFIG_CLKSRC_MMIO=y
#
# CONFIG_VIRT_DRIVERS is not set
# CONFIG_PM_DEVFREQ is not set
+CONFIG_IRQCHIP=y
#
# File systems
diff --git a/recipes-kernel/linux/linux-yocto-custom/linux-3.4/elpaso/defconfig b/recipes-kernel/linux/linux-yocto-custom/linux-3.4/elpaso/defconfig
index 9593cff..8ed201b 100644
--- a/recipes-kernel/linux/linux-yocto-custom/linux-3.4/elpaso/defconfig
+++ b/recipes-kernel/linux/linux-yocto-custom/linux-3.4/elpaso/defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.4.28 Kernel Configuration
+# Linux/powerpc 3.4.43 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -54,8 +54,7 @@ CONFIG_GENERIC_NVRAM=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_PPC_OF=y
-# CONFIG_PPC_UDBG_16550 is not set
-CONFIG_PPC_UDBG_ARM_AMBA=y
+CONFIG_PPC_UDBG_16550=y
CONFIG_GENERIC_TBSYNC=y
CONFIG_AUDIT_ARCH=y
CONFIG_GENERIC_BUG=y
@@ -251,9 +250,9 @@ CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_FREEZER=y
+CONFIG_LSI_PPC_PCI=y
CONFIG_PPC4xx_PCI_EXPRESS=y
# CONFIG_PPC4xx_MSI is not set
-CONFIG_ACP3400_PCI_4xx=y
CONFIG_PPC_MSI_BITMAP=y
# CONFIG_PPC_XICS is not set
# CONFIG_PPC_ICP_NATIVE is not set
@@ -288,21 +287,9 @@ CONFIG_PPC_47x=y
CONFIG_ELPASO=y
# CONFIG_ICON is not set
CONFIG_ACP=y
-# CONFIG_ACPISS is not set
-# CONFIG_ACP3400_DUS is not set
-# CONFIG_ACP3400_DUS_TB is not set
-# CONFIG_ACP3400_DUW2 is not set
-# CONFIG_ACP3400_TP1 is not set
-# CONFIG_ACP3400_TP5 is not set
-# CONFIG_ACP3400_DUW31 is not set
# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
# CONFIG_PPC44x_SIMPLE is not set
# CONFIG_PPC4xx_GPIO is not set
-CONFIG_ACP3400_GPIO=y
-# CONFIG_PCA9554_GPIO is not set
-CONFIG_ACP3400_I2C=y
-CONFIG_ACP3400_SSP=y
-CONFIG_ACP_PCIE_HOTPLUG=y
CONFIG_440GP=y
# CONFIG_PPC_WSP is not set
# CONFIG_KVM_GUEST is not set
@@ -359,6 +346,8 @@ CONFIG_ARCH_CPU_PROBE_RELEASE=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
CONFIG_ARCH_HAS_WALK_MEMORY=y
CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
# CONFIG_IRQ_ALL_CPUS is not set
CONFIG_MAX_ACTIVE_REGIONS=32
CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -387,7 +376,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="console=ttyS0 mtdparts=acp-nand:512K(2ndStage),512K(env-0),512K(env-1),512K(3rdStage),-(fs) ip=dhcp root=/dev/nfs"
CONFIG_EXTRA_TARGETS=""
-CONFIG_SUSPEND=y
+# CONFIG_SUSPEND is not set
CONFIG_SUSPEND_FREEZER=y
# CONFIG_HIBERNATION is not set
CONFIG_PM_SLEEP=y
@@ -432,23 +421,10 @@ CONFIG_PCI_DEBUG=y
# CONFIG_HOTPLUG_PCI is not set
CONFIG_HAS_RAPIDIO=y
CONFIG_RAPIDIO=y
-CONFIG_ACP3400_RIO=y
-CONFIG_RIO_MAX_IRQS=0x20
-CONFIG_ACP_RIO_STAT=y
-# CONFIG_SRIO_IRQ_TIME is not set
-# CONFIG_ACP_RIO_16B_ID is not set
-CONFIG_ACP_RIO_DEBUG=y
# CONFIG_FSL_RIO is not set
-CONFIG_RIO_MAINT_WIN_SIZE=0x1000000
# CONFIG_RAPIDIO_TSI721 is not set
CONFIG_RAPIDIO_DISC_TIMEOUT=10
CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y
-# CONFIG_RAPIDIO_DIO_DMA is not set
-CONFIG_RAPIDIO_ACCESS_ERR_LIMIT=0
-# CONFIG_RAPIDIO_DYNAMIC_ROUTES is not set
-# CONFIG_RAPIDIO_MULTICAST_PW is not set
-# CONFIG_RAPIDIO_HOTPLUG is not set
-# CONFIG_RAPIDIO_STATIC_DESTID is not set
CONFIG_RAPIDIO_DEBUG=y
# CONFIG_RAPIDIO_TSI57X is not set
CONFIG_RAPIDIO_CPS_XX=y
@@ -469,6 +445,7 @@ CONFIG_PAGE_OFFSET_BOOL=y
CONFIG_PAGE_OFFSET=0xa0000000
CONFIG_KERNEL_START_BOOL=y
CONFIG_KERNEL_START=0xa0400000
+CONFIG_PHYSICAL_START_BOOL=y
CONFIG_PHYSICAL_START=0x400000
CONFIG_TASK_SIZE_BOOL=y
CONFIG_TASK_SIZE=0xa0000000
@@ -760,6 +737,7 @@ CONFIG_OF_DEVICE=y
CONFIG_OF_GPIO=y
CONFIG_OF_I2C=y
CONFIG_OF_NET=y
+CONFIG_OF_MDIO=y
CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y
CONFIG_OF_MTD=y
@@ -785,7 +763,6 @@ CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=35000
# CONFIG_BLK_DEV_XIP is not set
-# CONFIG_BLK_DEV_ISS is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_XILINX_SYSACE is not set
@@ -1017,6 +994,13 @@ CONFIG_NET_VENDOR_CHELSIO=y
# CONFIG_CHELSIO_T4VF is not set
CONFIG_NET_VENDOR_CISCO=y
# CONFIG_ENIC is not set
+CONFIG_LSI_NET=y
+CONFIG_LSI_NET_NUM_RX_DESC=4
+CONFIG_LSI_NET_RX_BUF_SZ=32768
+CONFIG_LSI_NET_NUM_TX_DESC=4
+CONFIG_LSI_NET_TX_BUF_SZ=32768
+CONFIG_DISABLE_TX_INTERRUPTS=y
+# CONFIG_PRELOAD_RX_BUFFERS is not set
# CONFIG_DNET is not set
CONFIG_NET_VENDOR_DEC=y
# CONFIG_NET_TULIP is not set
@@ -1121,7 +1105,28 @@ CONFIG_NET_VENDOR_XILINX=y
# CONFIG_XILINX_LL_TEMAC is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
-# CONFIG_PHYLIB is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_AMD_PHY is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_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_PPP is not set
# CONFIG_SLIP is not set
# CONFIG_TR is not set
@@ -1147,11 +1152,6 @@ CONFIG_USB_ZD1201=y
#
# CONFIG_WAN is not set
# CONFIG_VMXNET3 is not set
-CONFIG_LSI_NET=y
-CONFIG_LSI_NET_NUM_RX_DESC=4
-CONFIG_LSI_NET_RX_BUF_SZ=32768
-CONFIG_LSI_NET_NUM_TX_DESC=4
-CONFIG_LSI_NET_TX_BUF_SZ=32768
# CONFIG_ISDN is not set
#
@@ -1293,7 +1293,6 @@ CONFIG_I2C_COMPAT=y
CONFIG_I2C_CHARDEV=y
# CONFIG_I2C_MUX is not set
CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOBIT=y
#
# I2C Hardware Bus support
@@ -1345,7 +1344,8 @@ CONFIG_I2C_ALGOBIT=y
# Other I2C/SMBus bus drivers
#
# CONFIG_I2C_STUB is not set
-CONFIG_I2C_AXXIA=y
+# CONFIG_I2C_AXXIA is not set
+CONFIG_ACP3400_I2C=y
CONFIG_I2C_DEBUG_CORE=y
CONFIG_I2C_DEBUG_ALGO=y
CONFIG_I2C_DEBUG_BUS=y
@@ -1377,6 +1377,7 @@ CONFIG_GPIOLIB=y
# Memory mapped GPIO drivers:
#
# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_PL061 is not set
# CONFIG_GPIO_XILINX is not set
# CONFIG_GPIO_VX855 is not set
@@ -1570,6 +1571,7 @@ CONFIG_USB_MON=y
#
# USB Host Controller Drivers
#
+CONFIG_LSI_USB_SW_WORKAROUND=y
# CONFIG_USB_C67X00_HCD is not set
# CONFIG_USB_XHCI_HCD is not set
CONFIG_USB_EHCI_HCD=y
@@ -1679,7 +1681,7 @@ CONFIG_DMADEVICES=y
#
CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
# CONFIG_DW_DMAC is not set
-CONFIG_ACP_GPDMA=y
+CONFIG_LSI_DMA=y
# CONFIG_TIMB_DMA is not set
CONFIG_DMA_ENGINE=y
@@ -1708,7 +1710,6 @@ CONFIG_DMA_ENGINE=y
# Hardware Spinlock drivers
#
CONFIG_IOMMU_SUPPORT=y
-# CONFIG_SHMOBILE_IOMMU is not set
#
# Remoteproc drivers (EXPERIMENTAL)
@@ -1719,6 +1720,7 @@ CONFIG_IOMMU_SUPPORT=y
#
# CONFIG_VIRT_DRIVERS is not set
# CONFIG_PM_DEVFREQ is not set
+CONFIG_IRQCHIP=y
#
# File systems
@@ -1875,6 +1877,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NLS_KOI8_U is not set
# CONFIG_NLS_UTF8 is not set
+# CONFIG_VMFS_FS is not set
# CONFIG_BINARY_PRINTF is not set
#
@@ -2015,11 +2018,10 @@ CONFIG_XMON_DISASSEMBLY=y
CONFIG_DEBUGGER=y
# CONFIG_BDI_SWITCH is not set
CONFIG_PPC_EARLY_DEBUG=y
-# CONFIG_PPC_EARLY_DEBUG_44x is not set
-CONFIG_PPC_EARLY_DEBUG_AXXIA=y
+CONFIG_PPC_EARLY_DEBUG_44x=y
+CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0x40000200
+CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
CONFIG_STRICT_DEVMEM=y
-CONFIG_PPC_EARLY_DBG_AXXIA_PHYSLOW=0x00400000
-CONFIG_PPC_EARLY_DBG_AXXIA_PHYSHIGH=0x20
#
# Security options
diff --git a/recipes-kernel/linux/linux-yocto-custom/linux-3.4/elpaso/elpaso.inc b/recipes-kernel/linux/linux-yocto-custom/linux-3.4/elpaso/elpaso.inc
deleted file mode 100644
index 7de6eec..0000000
--- a/recipes-kernel/linux/linux-yocto-custom/linux-3.4/elpaso/elpaso.inc
+++ /dev/null
@@ -1 +0,0 @@
-KBRANCH_${MACHINE} ?= "standard/lsi/acp34xx"
diff --git a/recipes-kernel/linux/linux-yocto_3.4.bbappend b/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 0fe5477..3cda401 100644
--- a/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,10 +1,12 @@
require linux-yocto_3.4.inc
-KBRANCH_${MACHINE} = "standard/lsi"
-
-SRCREV_machine_elpaso="a00b73a0ab965a3ceaec6228c922abd62e9eb422"
-SRCREV_machine_axm5500sim="a00b73a0ab965a3ceaec6228c922abd62e9eb422"
+KBRANCH_${MACHINE} = "standard/lsi/base"
+#SRCREV_machine_elpaso="a00b73a0ab965a3ceaec6228c922abd62e9eb422"
+#SRCREV_machine_axm5500sim="a00b73a0ab965a3ceaec6228c922abd62e9eb422"
SRCREV_meta="ca95ecf3ff7c6077d8002225db46d6a70c0c40ac"
+SRCREV_machine_${MACHINE}="${AUTOREV}"
+SRCREV_meta="${AUTOREV}"
+
LOCALCOUNT = "0"
diff --git a/recipes-kernel/linux/linux-yocto_3.4.inc b/recipes-kernel/linux/linux-yocto_3.4.inc
index 471bcca..4e9d7ef 100644
--- a/recipes-kernel/linux/linux-yocto_3.4.inc
+++ b/recipes-kernel/linux/linux-yocto_3.4.inc
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
COMPATIBLE_MACHINE = "elpaso|axm5500sim"
KMACHINE_${MACHINE} = "${MACHINE}"
-LINUX_VERSION = "3.4.50"
+LINUX_VERSION = "3.4.52"
KMETA = "meta"
LOCALCOUNT = "0"
-KSRC_linux_yocto_3_4 = "/home/pbutler/work/repos/linux-yocto-3.4/"
+KSRC_linux_yocto_3_4 = "/home/pbutler/work/repos/lsi_axxia_yocto/"
SRC_URI_${MACHINE} = "git://${KSRC_linux_yocto_3_4};protocol=file;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
--
1.8.1.4
More information about the meta-lsi
mailing list