diff mbox

[27/27] UBUNTU: build: Add powerpc-e500mc flavour

Message ID 0814facb3471ec438a1d58780037738d8a10fff9.1339455422.git.bcollins@ubuntu.com
State New
Headers show

Commit Message

Benjamin Collins June 10, 2012, 8:30 p.m. UTC 
This includes rerunning updateconfigs. Nothing was changed in other configs,
but the rerun did cause some extensive switching of config options from
common files, etc.

Signed-off-by: Ben Collins <bcollins@ubuntu.com>
---
 debian.master/config/amd64/config.common.amd64     |    5 +
 debian.master/config/armel/config.common.armel     |    7 +
 debian.master/config/armhf/config.common.armhf     |    7 +
 debian.master/config/config.common.ubuntu          |  193 ++++++++++++++++++--
 debian.master/config/enforce                       |    2 +-
 debian.master/config/i386/config.common.i386       |    5 +
 debian.master/config/powerpc/config.common.powerpc |   14 +-
 .../config/powerpc/config.flavour.powerpc-e500mc   |   58 ++++++
 .../config/powerpc/config.flavour.powerpc-smp      |   15 ++
 .../config/powerpc/config.flavour.powerpc64-smp    |   13 ++
 debian.master/config/ppc64/config.common.ppc64     |   13 ++
 debian.master/control.d/vars.powerpc-e500mc        |    6 +
 debian.master/control.stub.in                      |    2 +-
 debian.master/d-i/kernel-versions.in               |    1 +
 debian.master/rules.d/powerpc.mk                   |   16 +-
 15 files changed, 334 insertions(+), 23 deletions(-)
 create mode 100644 debian.master/config/powerpc/config.flavour.powerpc-e500mc
 create mode 100644 debian.master/control.d/vars.powerpc-e500mc
diff mbox

Patch

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 9c81f3b..8c66846 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -74,7 +74,9 @@  CONFIG_FB_SYS_IMAGEBLIT=m
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_VOODOO1=m
 CONFIG_FIRMWARE_EDID=y
+# CONFIG_FMAN_P3040_P4080_P5020 is not set
 # CONFIG_FONTS is not set
+# CONFIG_FSL_FMAN is not set
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
 CONFIG_GPIO_SYSFS=y
@@ -118,6 +120,7 @@  CONFIG_KEXEC=y
 CONFIG_KGDB=y
 CONFIG_KPROBES=y
 CONFIG_KSM=y
+CONFIG_KVM=m
 CONFIG_LATENCYTOP=y
 CONFIG_LDM_PARTITION=y
 CONFIG_LEGACY_PTY_COUNT=0
@@ -163,6 +166,7 @@  CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MTD=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_CFI_I4 is not set
 CONFIG_MTD_CHAR=m
 CONFIG_MTD_NAND=m
 CONFIG_MTD_NAND_BCH=m
@@ -188,6 +192,7 @@  CONFIG_PARPORT_1284=y
 CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_SIS=y
 CONFIG_PCCARD=m
+CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PMIC_ADP5520=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 1248e50..1b6146d 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -72,9 +72,11 @@  CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FMAN_P3040_P4080_P5020 is not set
 CONFIG_FONTS=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_FPE_NWFPE=y
+# CONFIG_FSL_FMAN is not set
 CONFIG_FTRACE=y
 # CONFIG_FUNCTION_TRACER is not set
 CONFIG_GPIO_SYSFS=y
@@ -122,6 +124,7 @@  CONFIG_KPROBES=y
 # CONFIG_KSM is not set
 CONFIG_LATENCYTOP=y
 CONFIG_LDM_PARTITION=y
+CONFIG_LEDS_RENESAS_TPU=y
 CONFIG_LEGACY_PTY_COUNT=0
 # CONFIG_LIBERTAS_MESH is not set
 # CONFIG_LIS3L02DQ is not set
@@ -170,6 +173,7 @@  CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MTD=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
+# CONFIG_MTD_CFI_I4 is not set
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_BCH=y
@@ -241,6 +245,7 @@  CONFIG_SERIAL_8250_EM=m
 CONFIG_SERIAL_AMBA_PL010=m
 CONFIG_SERIAL_AMBA_PL011=m
 CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_SERIAL_OF_PLATFORM=m
 CONFIG_SERIO_AMBAKMI=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
@@ -299,6 +304,8 @@  CONFIG_VERSION_SIGNATURE=""
 CONFIG_VFAT_FS=y
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+CONFIG_VIDEO_SH_MOBILE_CEU=m
+CONFIG_VIDEO_SH_MOBILE_CSI2=m
 # CONFIG_VIRTIO_BALLOON is not set
 # CONFIG_VIRTIO_MMIO is not set
 CONFIG_VIRT_DRIVERS=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 2b3d3ab..e9473c2 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -35,7 +35,9 @@  CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FMAN_P3040_P4080_P5020 is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_FSL_FMAN is not set
 # CONFIG_FUNCTION_TRACER is not set
 CONFIG_GPIO_TWL4030=y
 # CONFIG_HARDLOCKUP_DETECTOR is not set
@@ -48,12 +50,14 @@  CONFIG_I2C_ALGOBIT=m
 CONFIG_KGDB=y
 # CONFIG_KSM is not set
 CONFIG_LATENCYTOP=y
+CONFIG_LEDS_RENESAS_TPU=y
 # CONFIG_LIBERTAS_MESH is not set
 # CONFIG_LIS3L02DQ is not set
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_MAX_RAW_DEVS=256
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_SDHCI=y
+# CONFIG_MTD_CFI_I4 is not set
 # CONFIG_MTD_SM_COMMON is not set
 CONFIG_NEED_DMA_MAP_STATE=y
 # CONFIG_NL80211_TESTMODE is not set
@@ -79,6 +83,7 @@  CONFIG_SCHEDSTATS=y
 # CONFIG_SCSI_OSD_INITIATOR is not set
 CONFIG_SCSI_SPI_ATTRS=m
 # CONFIG_SERIAL_8250_EM is not set
+CONFIG_SERIAL_OF_PLATFORM=m
 # CONFIG_SND_EMU10K1_SEQ is not set
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SND_OPL4_LIB_SEQ is not set
@@ -104,6 +109,8 @@  CONFIG_USB_G_MULTI=m
 CONFIG_VFAT_FS=y
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+CONFIG_VIDEO_SH_MOBILE_CEU=m
+CONFIG_VIDEO_SH_MOBILE_CSI2=m
 # CONFIG_VIRTIO_BALLOON is not set
 # CONFIG_VIRTIO_MMIO is not set
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index bd166ad..543cce7 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -372,6 +372,7 @@  CONFIG_ASYNC_RAID6_RECOV=m
 CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
 CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
+CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
 CONFIG_ASYNC_XOR=m
 CONFIG_AT1700=m
 CONFIG_AT76C50X_USB=m
@@ -660,6 +661,9 @@  CONFIG_BNX2=m
 CONFIG_BNX2X=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_BONDING=m
+CONFIG_BOOKE=y
+CONFIG_BOOKE_WDT=m
+CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=38
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
@@ -770,6 +774,7 @@  CONFIG_CAN_EMS_PCI=m
 CONFIG_CAN_EMS_PCMCIA=m
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_FLEXCAN=m
 CONFIG_CAN_GW=m
 CONFIG_CAN_JANZ_ICAN3=m
 CONFIG_CAN_KVASER_PCI=m
@@ -1052,6 +1057,8 @@  CONFIG_COPS_TANGENT=y
 CONFIG_CORDIC=m
 CONFIG_COSA=m
 # CONFIG_CPA_DEBUG is not set
+CONFIG_CPM=y
+CONFIG_CPM2=y
 CONFIG_CPU5_WDT=m
 CONFIG_CPUSETS=y
 CONFIG_CPU_32v6K=y
@@ -1143,6 +1150,12 @@  CONFIG_CRYPTO_CTR=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_DEV_FSL_CAAM=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=255
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=2048
+CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
 CONFIG_CRYPTO_DEV_GEODE=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
@@ -1152,6 +1165,7 @@  CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_PADLOCK=y
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_TALITOS=m
 CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GCM=m
@@ -1305,7 +1319,6 @@  CONFIG_DEFAULT_SECURITY_APPARMOR=y
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_YAMA is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_DEFXX=m
 # CONFIG_DEFXX_MMIO is not set
@@ -1369,6 +1382,10 @@  CONFIG_DNOTIFY=y
 CONFIG_DNS_RESOLVER=y
 CONFIG_DONGLE=y
 CONFIG_DOUBLEFAULT=y
+CONFIG_DPA=y
+# CONFIG_DPAA_ETH_UNIT_TESTS is not set
+CONFIG_DPA_MAX_FRM_SIZE=1522
+CONFIG_DPA_OFFLINE_PORTS=y
 CONFIG_DQL=y
 CONFIG_DRAGONRISE_FF=y
 # CONFIG_DRBD_FAULT_INJECTION is not set
@@ -1583,6 +1600,7 @@  CONFIG_E1000=m
 CONFIG_E1000E=m
 # CONFIG_E200 is not set
 CONFIG_E2100=m
+CONFIG_E500=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
 CONFIG_EARLY_PRINTK_INTEL_MID=y
@@ -1613,6 +1631,7 @@  CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_MCE_INJ=m
 CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC_MPC85XX=m
 CONFIG_EDAC_PASEMI=m
 CONFIG_EDAC_R82600=m
 CONFIG_EDAC_SBRIDGE=m
@@ -1729,6 +1748,7 @@  CONFIG_FB_CYBER2000_DDC=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_FSL_DIU=m
 CONFIG_FB_GEODE=y
 CONFIG_FB_GEODE_GX=m
 CONFIG_FB_GEODE_GX1=m
@@ -1812,6 +1832,7 @@  CONFIG_FCOE_FNIC=m
 CONFIG_FDDI=y
 CONFIG_FEALNX=m
 CONFIG_FHANDLE=y
+# CONFIG_FHCI_DEBUG is not set
 CONFIG_FIB_RULES=y
 CONFIG_FILE_LOCKING=y
 CONFIG_FIREWIRE=m
@@ -1827,6 +1848,9 @@  CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FLATMEM=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_FMAN_MIB_CNT_OVF_IRQ_EN is not set
+# CONFIG_FMAN_P1023 is not set
+# CONFIG_FMAN_RESOURCE_ALLOCATION_ALGORITHM is not set
 # CONFIG_FONT_10x18 is not set
 # CONFIG_FONT_6x11 is not set
 # CONFIG_FONT_7x14 is not set
@@ -1852,9 +1876,80 @@  CONFIG_FSCACHE=m
 CONFIG_FSCACHE_HISTOGRAM=y
 # CONFIG_FSCACHE_OBJECT_LIST is not set
 CONFIG_FSCACHE_STATS=y
+CONFIG_FSL_BMAN=y
+CONFIG_FSL_BMAN_CONFIG=y
+CONFIG_FSL_BMAN_DEBUGFS=y
+CONFIG_FSL_BMAN_PORTAL=y
+# CONFIG_FSL_BMAN_TEST is not set
+CONFIG_FSL_BOOKE=y
+CONFIG_FSL_DMA=m
+CONFIG_FSL_DPA=y
+# CONFIG_FSL_DPA_1588 is not set
+CONFIG_FSL_DPA_CAN_WAIT=y
+CONFIG_FSL_DPA_CAN_WAIT_SYNC=y
+# CONFIG_FSL_DPA_CHECKING is not set
+CONFIG_FSL_DPA_HAVE_IRQ=y
+CONFIG_FSL_DPA_PIRQ_FAST=y
+CONFIG_FSL_DPA_PIRQ_SLOW=y
+CONFIG_FSL_DPA_PORTAL_SHARE=y
+CONFIG_FSL_DPA_UIO=m
+CONFIG_FSL_EMB_PERFMON=y
+CONFIG_FSL_EMB_PERF_EVENT=y
+CONFIG_FSL_EMB_PERF_EVENT_E500=y
+# CONFIG_FSL_FMAN_TEST is not set
+CONFIG_FSL_GTM=y
+CONFIG_FSL_HV_MANAGER=m
+CONFIG_FSL_IFC=y
 CONFIG_FSL_LBC=y
-# CONFIG_FSL_ULI1575 is not set
+CONFIG_FSL_P4080_DS_MDIO=y
+CONFIG_FSL_PAMU=y
+CONFIG_FSL_PCI=y
+CONFIG_FSL_PME2=y
+CONFIG_FSL_PME2_CTRL=y
+CONFIG_FSL_PME2_DB=y
+CONFIG_FSL_PME2_DB_QOSOUT_PRIORITY=2
+CONFIG_FSL_PME2_PDSRSIZE=131072
+CONFIG_FSL_PME2_PORTAL=y
+CONFIG_FSL_PME2_SCAN=y
+# CONFIG_FSL_PME2_SCAN_DEBUG is not set
+CONFIG_FSL_PME2_SRESIZE=327680
+# CONFIG_FSL_PME2_SRE_AIM is not set
+CONFIG_FSL_PME2_SRE_CNR=128
+CONFIG_FSL_PME2_SRE_CTX_SIZE_PER_SESSION=17
+# CONFIG_FSL_PME2_SRE_ESR is not set
+CONFIG_FSL_PME2_SRE_MAX_BLOCK_NUMBER=32767
+CONFIG_FSL_PME2_SRE_MAX_INSTRUCTION_LIMIT=65535
+CONFIG_FSL_PME2_STAT_ACCUMULATOR_UPDATE_INTERVAL=3400
+# CONFIG_FSL_PME2_TEST_HIGH is not set
+# CONFIG_FSL_PME2_TEST_SCAN is not set
+CONFIG_FSL_PQ_MDIO=m
+CONFIG_FSL_QMAN=y
+CONFIG_FSL_QMAN_BUG_AND_FEATURE_REV1=y
+CONFIG_FSL_QMAN_CI_SCHED_CFG_BMAN_W=2
+CONFIG_FSL_QMAN_CI_SCHED_CFG_RW_W=2
+CONFIG_FSL_QMAN_CI_SCHED_CFG_SRCCIV=4
+CONFIG_FSL_QMAN_CI_SCHED_CFG_SRQ_W=3
+CONFIG_FSL_QMAN_CONFIG=y
+CONFIG_FSL_QMAN_DEBUGFS=y
+CONFIG_FSL_QMAN_DQRR_PREFETCHING=y
+CONFIG_FSL_QMAN_FQD_SZ=9
+# CONFIG_FSL_QMAN_FQ_LOOKUP is not set
+CONFIG_FSL_QMAN_NULL_FQ_DEMUX=y
+CONFIG_FSL_QMAN_PIRQ_DQRR_ITHRESH=12
+CONFIG_FSL_QMAN_PIRQ_IPERIOD=100
+CONFIG_FSL_QMAN_PIRQ_MR_ITHRESH=4
+CONFIG_FSL_QMAN_POLL_LIMIT=32
+CONFIG_FSL_QMAN_PORTAL=y
+# CONFIG_FSL_QMAN_PORTAL_DISABLEAUTO_DCA is not set
+# CONFIG_FSL_QMAN_TEST is not set
+CONFIG_FSL_RIO=y
+CONFIG_FSL_SOC=y
+CONFIG_FSL_SOC_BOOKE=y
 CONFIG_FSNOTIFY=y
+CONFIG_FS_ENET=m
+CONFIG_FS_ENET_HAS_FCC=y
+CONFIG_FS_ENET_HAS_SCC=y
+CONFIG_FS_ENET_MDIO_FCC=m
 CONFIG_FS_MBCACHE=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_FT1000=m
@@ -1893,6 +1988,7 @@  CONFIG_GAMEPORT_NS558=m
 CONFIG_GARP=m
 CONFIG_GART_IOMMU=y
 # CONFIG_GCOV_KERNEL is not set
+CONFIG_GEF_WDT=m
 CONFIG_GELIC_NET=m
 CONFIG_GELIC_WIRELESS=y
 CONFIG_GENERIC_ACL=y
@@ -1930,9 +2026,10 @@  CONFIG_GENERIC_TBSYNC=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_TRACER=y
 CONFIG_GEOS=y
-# CONFIG_GE_FPGA is not set
+CONFIG_GE_IMP3A=y
 CONFIG_GFS2_FS=m
 CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_GIANFAR=m
 CONFIG_GIGASET_BASE=m
 # CONFIG_GIGASET_CAPI is not set
 # CONFIG_GIGASET_DEBUG is not set
@@ -1950,6 +2047,7 @@  CONFIG_GPIO_CS5535=m
 # CONFIG_GPIO_EM is not set
 CONFIG_GPIO_GENERIC=m
 CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIO_GE_FPGA=y
 CONFIG_GPIO_ICH=m
 CONFIG_GPIO_INTEL_PMIC=y
 CONFIG_GPIO_IT8761E=m
@@ -1962,6 +2060,7 @@  CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_MCP23S08=m
 CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_MPC8XXX=y
 CONFIG_GPIO_MSIC=y
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
@@ -1988,9 +2087,9 @@  CONFIG_HANGCHECK_TIMER=m
 CONFIG_HAPPYMEAL=m
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
+CONFIG_HAS_FSL_PME=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
-# CONFIG_HAS_RAPIDIO is not set
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_KGDB=y
@@ -2002,6 +2101,7 @@  CONFIG_HAVE_ARM_SCU=y
 CONFIG_HAVE_ARM_TWD=y
 CONFIG_HAVE_ATOMIC_IOMAP=y
 CONFIG_HAVE_BPF_JIT=y
+CONFIG_HAVE_CAN_FLEXCAN=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
@@ -2273,6 +2373,7 @@  CONFIG_I2C_AMD8111=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CPM=m
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CORE is not set
@@ -2900,14 +3001,17 @@  CONFIG_KS8851=m
 CONFIG_KS8851_MLL=m
 CONFIG_KS959_DONGLE=m
 CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KSI8560=y
 CONFIG_KSZ884X_PCI=m
 CONFIG_KTIME_SCALAR=y
-CONFIG_KVM=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_APIC_ARCHITECTURE=y
 CONFIG_KVM_ASYNC_PF=y
 # CONFIG_KVM_BOOK3S_64 is not set
+CONFIG_KVM_BOOKE_HV=y
 CONFIG_KVM_CLOCK=y
+CONFIG_KVM_E500MC=y
+# CONFIG_KVM_EXIT_TIMING is not set
 CONFIG_KVM_GUEST=y
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_MMIO=y
@@ -2963,7 +3067,6 @@  CONFIG_LEDS_PCA955X=m
 CONFIG_LEDS_PCA9633=m
 CONFIG_LEDS_PWM=m
 CONFIG_LEDS_REGULATOR=m
-CONFIG_LEDS_RENESAS_TPU=y
 CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
@@ -3034,6 +3137,7 @@  CONFIG_LOCKUP_DETECTOR=y
 # CONFIG_LOGFS is not set
 # CONFIG_LOGO is not set
 CONFIG_LOOPBACK_TARGET=m
+CONFIG_LOWMEM_CAM_NUM=3
 CONFIG_LOWMEM_SIZE=0x30000000
 CONFIG_LP486E=m
 CONFIG_LPC_ICH=m
@@ -3312,6 +3416,13 @@  CONFIG_MOUSE_SYNAPTICS_USB=m
 CONFIG_MOUSE_VSXXXAA=m
 CONFIG_MOXA_INTELLIO=m
 CONFIG_MOXA_SMARTIO=m
+CONFIG_MPC8536_DS=y
+CONFIG_MPC8540_ADS=y
+CONFIG_MPC8560_ADS=y
+CONFIG_MPC85xx_CDS=y
+CONFIG_MPC85xx_DS=y
+CONFIG_MPC85xx_MDS=y
+CONFIG_MPC85xx_RDB=y
 # CONFIG_MPENTIUM4 is not set
 # CONFIG_MPENTIUMII is not set
 # CONFIG_MPENTIUMIII is not set
@@ -3342,7 +3453,6 @@  CONFIG_MTD_CFI=m
 CONFIG_MTD_CFI_AMDSTD=m
 CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
 # CONFIG_MTD_CFI_I8 is not set
 CONFIG_MTD_CFI_INTELEXT=m
 CONFIG_MTD_CFI_STAA=m
@@ -3391,6 +3501,8 @@  CONFIG_MTD_NAND_DOCG4=m
 CONFIG_MTD_NAND_ECC_BCH=y
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND_FSL_ELBC=m
+CONFIG_MTD_NAND_FSL_IFC=m
+CONFIG_MTD_NAND_FSL_UPM=m
 CONFIG_MTD_NAND_GPIO=m
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 CONFIG_MTD_NAND_NANDSIM=m
@@ -3401,6 +3513,7 @@  CONFIG_MTD_NAND_OMAP_BCH8=y
 CONFIG_MTD_NAND_PASEMI=m
 CONFIG_MTD_NAND_PLATFORM=m
 CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_SOCRATES=m
 CONFIG_MTD_NAND_TMIO=m
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 CONFIG_MTD_NETSC520=m
@@ -3444,6 +3557,7 @@  CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_BEB_RESERVE=1
 CONFIG_MTD_UBI_GLUEBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_WRSBC8260=m
 CONFIG_MTRR=y
 CONFIG_MTRR_SANITIZER=y
 CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
@@ -3676,6 +3790,7 @@  CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
 CONFIG_NET_VENDOR_EXAR=y
 CONFIG_NET_VENDOR_FARADAY=y
+CONFIG_NET_VENDOR_FREESCALE=y
 CONFIG_NET_VENDOR_FUJITSU=y
 CONFIG_NET_VENDOR_HP=y
 CONFIG_NET_VENDOR_I825XX=y
@@ -3919,6 +4034,14 @@  CONFIG_ORINOCO_USB=m
 CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_OVERLAYFS_FS=m
+CONFIG_P1010_RDB=y
+CONFIG_P1022_DS=y
+CONFIG_P1023_RDS=y
+CONFIG_P2041_RDB=y
+CONFIG_P3041_DS=y
+CONFIG_P3060_QDS=y
+CONFIG_P4080_DS=y
+CONFIG_P5020_DS=y
 CONFIG_P54_COMMON=m
 CONFIG_P54_LEDS=y
 CONFIG_P54_PCI=m
@@ -4114,7 +4237,7 @@  CONFIG_PHONET=m
 CONFIG_PHONE_IXJ=m
 CONFIG_PHONE_IXJ_PCMCIA=m
 CONFIG_PHYLIB=y
-CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_PHYS_64BIT=y
 CONFIG_PID_NS=y
 # CONFIG_PL310_ERRATA_588369 is not set
 # CONFIG_PL310_ERRATA_727915 is not set
@@ -4166,26 +4289,29 @@  CONFIG_PPC32=y
 # CONFIG_PPC601_SYNC_FIX is not set
 # CONFIG_PPC_82xx is not set
 # CONFIG_PPC_83xx is not set
-# CONFIG_PPC_85xx is not set
 # CONFIG_PPC_86xx is not set
 # CONFIG_PPC_8xx is not set
+CONFIG_PPC_ADV_DEBUG_DACS=2
+CONFIG_PPC_ADV_DEBUG_DVCS=0
+CONFIG_PPC_ADV_DEBUG_IACS=2
+CONFIG_PPC_ADV_DEBUG_REGS=y
 # CONFIG_PPC_BOOK3E_64 is not set
+CONFIG_PPC_BOOK3E_MMU=y
 CONFIG_PPC_BOOK3S=y
-CONFIG_PPC_BOOK3S_32=y
 CONFIG_PPC_BOOK3S_64=y
 # CONFIG_PPC_CELLEB is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_CELL_QPACE is not set
 CONFIG_PPC_CHRP=y
-# CONFIG_PPC_CLOCK is not set
 # CONFIG_PPC_DCR_MMIO is not set
 # CONFIG_PPC_DCR_NATIVE is not set
 CONFIG_PPC_DISABLE_WERROR=y
+CONFIG_PPC_E500MC=y
 # CONFIG_PPC_EARLY_DEBUG is not set
 # CONFIG_PPC_EMULATED_STATS is not set
 CONFIG_PPC_EPAPR_HV_BYTECHAN=m
-# CONFIG_PPC_EPAPR_HV_PIC is not set
 CONFIG_PPC_FPU=y
+CONFIG_PPC_FSL_BOOK3E=y
 CONFIG_PPC_HAS_HASH_64K=y
 CONFIG_PPC_HAVE_PMU_SUPPORT=y
 CONFIG_PPC_I8259=y
@@ -4193,7 +4319,9 @@  CONFIG_PPC_I8259=y
 CONFIG_PPC_ICSWX=y
 CONFIG_PPC_ICSWX_PID=y
 # CONFIG_PPC_ICSWX_USE_SIGILL is not set
+CONFIG_PPC_LIB_RHEAP=y
 CONFIG_PPC_MAPLE=y
+CONFIG_PPC_MMU_NOHASH=y
 # CONFIG_PPC_MPC512x is not set
 # CONFIG_PPC_MPC52xx is not set
 CONFIG_PPC_MSI_BITMAP=y
@@ -4215,7 +4343,6 @@  CONFIG_PPC_POWERNV=y
 CONFIG_PPC_POWERNV_RTAS=y
 CONFIG_PPC_PS3=y
 CONFIG_PPC_PSERIES=y
-CONFIG_PPC_RTAS=y
 CONFIG_PPC_RTAS_DAEMON=y
 CONFIG_PPC_SMP_MUXED_IPI=y
 CONFIG_PPC_STD_MMU=y
@@ -4283,7 +4410,10 @@  CONFIG_PS3_VUART=y
 CONFIG_PSERIES_IDLE=y
 CONFIG_PSERIES_MSI=y
 CONFIG_PSTORE_RAM=m
+CONFIG_PTE_64BIT=y
 # CONFIG_PTP_1588_CLOCK is not set
+CONFIG_QE_GPIO=y
+CONFIG_QE_USB=y
 CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
 CONFIG_QLA3XXX=m
@@ -4293,6 +4423,7 @@  CONFIG_QNX4FS_FS=m
 # CONFIG_QNX6FS_DEBUG is not set
 CONFIG_QNX6FS_FS=m
 CONFIG_QSEMI_PHY=y
+CONFIG_QUICC_ENGINE=y
 CONFIG_QUOTA=y
 CONFIG_QUOTACTL=y
 CONFIG_QUOTACTL_COMPAT=y
@@ -4565,6 +4696,7 @@  CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_SAMSUNG_Q10=m
 CONFIG_SATA_ACARD_AHCI=m
 CONFIG_SATA_AHCI=y
+CONFIG_SATA_FSL=m
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_NV=m
 CONFIG_SATA_PMP=y
@@ -4579,6 +4711,8 @@  CONFIG_SATA_VIA=m
 CONFIG_SATA_VITESSE=m
 CONFIG_SBC7240_WDT=m
 CONFIG_SBC8360_WDT=m
+CONFIG_SBC8548=y
+CONFIG_SBC8560=y
 CONFIG_SBC_EPX_C3_WATCHDOG=m
 CONFIG_SBC_FITPC2_WATCHDOG=m
 CONFIG_SBE_2T3E3=m
@@ -4898,6 +5032,7 @@  CONFIG_SERIAL_8250_DW=m
 CONFIG_SERIAL_8250_EXAR_ST16C554=m
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_FOURPORT=m
+CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_8250_HUB6=m
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_NR_UARTS=48
@@ -4912,6 +5047,7 @@  CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_CPM=m
 CONFIG_SERIAL_ICOM=m
 # CONFIG_SERIAL_IFX6X60 is not set
 CONFIG_SERIAL_IPOCTAL=m
@@ -4920,13 +5056,13 @@  CONFIG_SERIAL_MAX3100=m
 CONFIG_SERIAL_MAX3107=m
 CONFIG_SERIAL_MFD_HSU=m
 CONFIG_SERIAL_MRST_MAX3110=m
-CONFIG_SERIAL_OF_PLATFORM=m
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
 CONFIG_SERIAL_PCH_UART=m
 CONFIG_SERIAL_PMACZILOG=y
 CONFIG_SERIAL_PMACZILOG_CONSOLE=y
 # CONFIG_SERIAL_PMACZILOG_TTYS is not set
+CONFIG_SERIAL_QE=m
 CONFIG_SERIAL_TIMBERDALE=m
 CONFIG_SERIAL_UARTLITE=m
 CONFIG_SERIAL_XILINX_PS_UART=m
@@ -5153,6 +5289,7 @@  CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y
+CONFIG_SND_POWERPC_SOC=m
 CONFIG_SND_PPC=y
 CONFIG_SND_PS3=m
 CONFIG_SND_PS3_DEFAULT_START_DELAY=2000
@@ -5201,6 +5338,8 @@  CONFIG_SND_SOC_CS42L73=m
 CONFIG_SND_SOC_CX20442=m
 CONFIG_SND_SOC_DA7210=m
 CONFIG_SND_SOC_DFBMCS320=m
+CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_FSL_UTILS=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_JZ4740_CODEC=m
 CONFIG_SND_SOC_L3=m
@@ -5213,7 +5352,9 @@  CONFIG_SND_SOC_MAX9850=m
 CONFIG_SND_SOC_MAX9877=m
 CONFIG_SND_SOC_MC13783=m
 CONFIG_SND_SOC_ML26124=m
+CONFIG_SND_SOC_P1022_DS=m
 CONFIG_SND_SOC_PCM3008=m
+CONFIG_SND_SOC_POWERPC_DMA=m
 CONFIG_SND_SOC_RT5631=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SN95031=m
@@ -5304,6 +5445,7 @@  CONFIG_SND_VX_LIB=m
 CONFIG_SND_WAVEFRONT=m
 CONFIG_SND_WSS_LIB=m
 CONFIG_SND_YMFPCI=m
+CONFIG_SOCRATES=y
 CONFIG_SOC_AM33XX=y
 CONFIG_SOC_CAMERA=m
 CONFIG_SOC_CAMERA_IMX074=m
@@ -5366,6 +5508,9 @@  CONFIG_SPI_DESIGNWARE=m
 CONFIG_SPI_DW_MID_DMA=y
 # CONFIG_SPI_DW_MMIO is not set
 CONFIG_SPI_DW_PCI=m
+CONFIG_SPI_FSL_ESPI=y
+CONFIG_SPI_FSL_LIB=y
+# CONFIG_SPI_FSL_SPI is not set
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_LM70_LLP=m
 CONFIG_SPI_MASTER=y
@@ -5419,6 +5564,7 @@  CONFIG_STP=m
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_STUB_POULSBO is not set
+CONFIG_STX_GP3=y
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_SUNGEM=m
@@ -5609,6 +5755,12 @@  CONFIG_TOUCHSCREEN_WM97XX=m
 CONFIG_TPS6105X=m
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
+CONFIG_TQM8540=y
+CONFIG_TQM8541=y
+CONFIG_TQM8548=y
+CONFIG_TQM8555=y
+CONFIG_TQM8560=y
+CONFIG_TQM85xx=y
 CONFIG_TRACEPOINTS=y
 CONFIG_TRACER_MAX_TRACE=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -5646,6 +5798,10 @@  CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UCB1400_CORE=m
+CONFIG_UCC=y
+CONFIG_UCC_FAST=y
+CONFIG_UCC_GETH=m
+CONFIG_UCC_SLOW=y
 CONFIG_UDBG_RTAS_CONSOLE=y
 CONFIG_UDF_FS=m
 CONFIG_UDF_NLS=y
@@ -5653,6 +5809,7 @@  CONFIG_UEVENT_HELPER_PATH=""
 # CONFIG_UFS_DEBUG is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UGETH_TX_ON_DEMAND is not set
 CONFIG_UID16=y
 CONFIG_UIO=m
 CONFIG_UIO_AEC=m
@@ -5709,6 +5866,7 @@  CONFIG_USB_DSBR=m
 CONFIG_USB_EG20T=m
 CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y
 CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
+CONFIG_USB_EHCI_FSL=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_HCD_OMAP=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
@@ -5722,7 +5880,11 @@  CONFIG_USB_ETH=m
 # CONFIG_USB_ETH_EEM is not set
 CONFIG_USB_ETH_RNDIS=y
 CONFIG_USB_EZUSB=y
+CONFIG_USB_FHCI_HCD=m
 # CONFIG_USB_FILE_STORAGE is not set
+CONFIG_USB_FSL_MPH_DR_OF=y
+CONFIG_USB_FSL_QE=m
+CONFIG_USB_FSL_USB2=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_FUNCTIONFS=m
 CONFIG_USB_FUNCTIONFS_ETH=y
@@ -6137,8 +6299,6 @@  CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_SAA717X=m
 CONFIG_VIDEO_SAA7185=m
 CONFIG_VIDEO_SAA7191=m
-CONFIG_VIDEO_SH_MOBILE_CEU=m
-CONFIG_VIDEO_SH_MOBILE_CSI2=m
 CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_TCM825X=m
 CONFIG_VIDEO_TDA7432=m
@@ -6407,6 +6567,7 @@  CONFIG_XEN_SYS_HYPERVISOR=y
 CONFIG_XEN_TMEM=y
 CONFIG_XEN_WDT=m
 CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XES_MPC85xx=y
 CONFIG_XFRM=y
 CONFIG_XFRM_ALGO=m
 CONFIG_XFRM_IPCOMP=m
diff --git a/debian.master/config/enforce b/debian.master/config/enforce
index 839c090..cf26426 100644
--- a/debian.master/config/enforce
+++ b/debian.master/config/enforce
@@ -93,7 +93,7 @@  value CONFIG_EFI_VARS y | !exists CONFIG_EFI_VARS
  (flavour powerpc powerpc-smp & value CONFIG_THERM_ADT746X y)
 
 # Ensure CONFIG_NVRAM is y for powerpc and powerpc-smp, LP:942193
-(flavour powerpc powerpc-smp & value CONFIG_NVRAM y) | \
+(flavour powerpc powerpc-smp powerpc-e500mc & value CONFIG_NVRAM y) | \
  (value CONFIG_NVRAM m | !exists CONFIG_NVRAM)
 
 # Ensure CONFIG_STUB_POULSBO is disabled if CONFIG_DRM_PSB is enabled
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index ad9f741..ae396c2 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -73,7 +73,9 @@  CONFIG_FB_SYS_IMAGEBLIT=m
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_VOODOO1=m
 CONFIG_FIRMWARE_EDID=y
+# CONFIG_FMAN_P3040_P4080_P5020 is not set
 # CONFIG_FONTS is not set
+# CONFIG_FSL_FMAN is not set
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
 CONFIG_GPIO_SYSFS=y
@@ -118,6 +120,7 @@  CONFIG_KEXEC=y
 CONFIG_KGDB=y
 CONFIG_KPROBES=y
 CONFIG_KSM=y
+CONFIG_KVM=m
 CONFIG_LATENCYTOP=y
 CONFIG_LDM_PARTITION=y
 CONFIG_LEGACY_PTY_COUNT=0
@@ -162,6 +165,7 @@  CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MTD=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_CFI_I4 is not set
 CONFIG_MTD_CHAR=m
 CONFIG_MTD_NAND=m
 CONFIG_MTD_NAND_BCH=m
@@ -187,6 +191,7 @@  CONFIG_PARPORT_1284=y
 CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_SIS=y
 CONFIG_PCCARD=m
+CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PMIC_ADP5520=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 5047cf7..3d65d01 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -14,6 +14,7 @@  CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_ATARI_PARTITION=y
 CONFIG_ATA_GENERIC=m
 CONFIG_ATA_PIIX=m
+# CONFIG_ATMEL_PWM is not set
 # CONFIG_ATM_BR2684_IPFILTER is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_AUXDISPLAY=y
@@ -41,6 +42,7 @@  CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_DM_RAID45 is not set
 # CONFIG_DVB_FE_CUSTOMISE is not set
 CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+# CONFIG_DW_DMAC is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 CONFIG_EVM=y
@@ -75,8 +77,10 @@  CONFIG_HAMRADIO=y
 CONFIG_HIDRAW=y
 CONFIG_HTC_I2CPLD=y
 # CONFIG_HVC_CONSOLE is not set
+CONFIG_HW_RANDOM_ATMEL=m
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=y
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 CONFIG_I2C_HELPER_AUTO=y
 # CONFIG_IBMEBUS is not set
 # CONFIG_IDE is not set
@@ -105,9 +109,12 @@  CONFIG_JFS_SECURITY=y
 CONFIG_JFS_STATISTICS=y
 CONFIG_KARMA_PARTITION=y
 CONFIG_KEXEC=y
+# CONFIG_KEYBOARD_SAMSUNG is not set
 CONFIG_KPROBES=y
 CONFIG_KSM=y
+CONFIG_KVM=y
 CONFIG_LDM_PARTITION=y
+# CONFIG_LEDS_RENESAS_TPU is not set
 CONFIG_LEGACY_PTY_COUNT=0
 CONFIG_LIBERTAS_MESH=y
 # CONFIG_LIBIPW_DEBUG is not set
@@ -175,6 +182,7 @@  CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_SIS=m
 CONFIG_PCCARD=m
 CONFIG_PCI_SYSCALL=y
+CONFIG_PHYSICAL_ALIGN=0x04000000
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_PMIC_ADP5520=y
 CONFIG_PMIC_DA903X=y
@@ -201,6 +209,7 @@  CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_RELAY=y
+# CONFIG_RFKILL_GPIO is not set
 CONFIG_RT2800USB_UNKNOWN=y
 # CONFIG_RT2X00_LIB_DEBUGFS is not set
 # CONFIG_RTAS_FLASH is not set
@@ -221,7 +230,7 @@  CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_DISABLE=y
 CONFIG_SECURITY_TOMOYO=y
 # CONFIG_SENSORS_SCH56XX_COMMON is not set
-CONFIG_SERIAL_8250=m
+CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_PCI=m
 CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIO_SERPORT=m
@@ -253,6 +262,7 @@  CONFIG_TCP_MD5SIG=y
 CONFIG_TEST_KSTRTOX=m
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_EGALAX=m
+# CONFIG_TOUCHSCREEN_W90X900 is not set
 CONFIG_TWL4030_CORE=y
 CONFIG_TWL4030_USB=m
 CONFIG_TWL6040_CORE=y
@@ -282,6 +292,8 @@  CONFIG_VFAT_FS=m
 CONFIG_VGASTATE=m
 CONFIG_VGA_ARB_MAX_GPUS=16
 # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+# CONFIG_VIDEO_SH_MOBILE_CEU is not set
+# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
 CONFIG_VIRTIO=m
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
diff --git a/debian.master/config/powerpc/config.flavour.powerpc-e500mc b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
new file mode 100644
index 0000000..8d9d406
--- /dev/null
+++ b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
@@ -0,0 +1,58 @@ 
+#
+# Config options for config.flavour.powerpc-e500mc automatically generated by splitconfig.pl
+#
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_CFG80211_REG_DEBUG=y
+# CONFIG_CRASH_DUMP is not set
+CONFIG_DEFAULT_UIMAGE=y
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+CONFIG_FMAN_P3040_P4080_P5020=y
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_FSL_FMAN=y
+CONFIG_FSL_ULI1575=y
+CONFIG_GE_FPGA=y
+CONFIG_HAS_FSL_PAMU=y
+CONFIG_HAS_FSL_QBMAN=y
+CONFIG_HAS_RAPIDIO=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_HUGETLB_PAGE=y
+CONFIG_KERNEL_START=0xc0000000
+# CONFIG_KGDB is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_MAX_ACTIVE_REGIONS=32
+CONFIG_MMIO_NVRAM=y
+# CONFIG_MPIC_U3_HT_IRQS is not set
+CONFIG_MTD_CFI_I4=y
+# CONFIG_NEED_DMA_MAP_STATE is not set
+# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
+# CONFIG_NONSTATIC_KERNEL is not set
+CONFIG_NR_CPUS=8
+CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_PHYS_ADDR_T_64BIT=y
+# CONFIG_PPC64 is not set
+CONFIG_PPC_85xx=y
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_BOOK3S_32 is not set
+# CONFIG_PPC_CELL is not set
+CONFIG_PPC_CLOCK=y
+CONFIG_PPC_EPAPR_HV_PIC=y
+# CONFIG_PPC_ICP_HV is not set
+# CONFIG_PPC_ICP_NATIVE is not set
+# CONFIG_PPC_ICS_RTAS is not set
+CONFIG_PPC_INDIRECT_PCI=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_P7_NAP is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_PPC_XICS is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
+CONFIG_WORD_SIZE=32
+CONFIG_ZLIB_DEFLATE=m
diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp
index c1e799e..013dbe3 100644
--- a/debian.master/config/powerpc/config.flavour.powerpc-smp
+++ b/debian.master/config/powerpc/config.flavour.powerpc-smp
@@ -7,11 +7,19 @@ 
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_CFG80211_REG_DEBUG=y
 # CONFIG_CRASH_DUMP is not set
+# CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FMAN_P3040_P4080_P5020 is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_FSL_FMAN is not set
+# CONFIG_FSL_ULI1575 is not set
+# CONFIG_GE_FPGA is not set
+# CONFIG_HAS_FSL_PAMU is not set
+# CONFIG_HAS_FSL_QBMAN is not set
+# CONFIG_HAS_RAPIDIO is not set
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_KERNEL_START=0xc0000000
@@ -20,6 +28,7 @@  CONFIG_KERNEL_START=0xc0000000
 CONFIG_MAX_ACTIVE_REGIONS=32
 # CONFIG_MMIO_NVRAM is not set
 # CONFIG_MPIC_U3_HT_IRQS is not set
+# CONFIG_MTD_CFI_I4 is not set
 # CONFIG_NEED_DMA_MAP_STATE is not set
 # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
 # CONFIG_NONSTATIC_KERNEL is not set
@@ -27,8 +36,12 @@  CONFIG_NR_CPUS=4
 CONFIG_PAGE_OFFSET=0xc0000000
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 # CONFIG_PPC64 is not set
+# CONFIG_PPC_85xx is not set
 # CONFIG_PPC_970_NAP is not set
+CONFIG_PPC_BOOK3S_32=y
 # CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CLOCK is not set
+# CONFIG_PPC_EPAPR_HV_PIC is not set
 # CONFIG_PPC_ICP_HV is not set
 # CONFIG_PPC_ICP_NATIVE is not set
 # CONFIG_PPC_ICS_RTAS is not set
@@ -36,8 +49,10 @@  CONFIG_PPC_INDIRECT_PCI=y
 # CONFIG_PPC_MM_SLICES is not set
 CONFIG_PPC_MPC106=y
 # CONFIG_PPC_P7_NAP is not set
+CONFIG_PPC_RTAS=y
 # CONFIG_PPC_XICS is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_SCHEDSTATS is not set
+CONFIG_SERIAL_OF_PLATFORM=m
 CONFIG_WORD_SIZE=32
 CONFIG_ZLIB_DEFLATE=m
diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-smp b/debian.master/config/powerpc/config.flavour.powerpc64-smp
index 133a965..b287075 100644
--- a/debian.master/config/powerpc/config.flavour.powerpc64-smp
+++ b/debian.master/config/powerpc/config.flavour.powerpc64-smp
@@ -7,11 +7,19 @@  CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ATA_NONSTANDARD=y
 # CONFIG_CFG80211_REG_DEBUG is not set
 CONFIG_CRASH_DUMP=y
+# CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FMAN_P3040_P4080_P5020 is not set
 CONFIG_FORCE_MAX_ZONEORDER=13
+# CONFIG_FSL_FMAN is not set
+# CONFIG_FSL_ULI1575 is not set
+# CONFIG_GE_FPGA is not set
+# CONFIG_HAS_FSL_PAMU is not set
+# CONFIG_HAS_FSL_QBMAN is not set
+# CONFIG_HAS_RAPIDIO is not set
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_KERNEL_START=0xc000000000000000
@@ -20,6 +28,7 @@  CONFIG_LATENCYTOP=y
 CONFIG_MAX_ACTIVE_REGIONS=256
 CONFIG_MMIO_NVRAM=y
 CONFIG_MPIC_U3_HT_IRQS=y
+# CONFIG_MTD_CFI_I4 is not set
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NONSTATIC_KERNEL=y
@@ -29,6 +38,8 @@  CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PPC64=y
 CONFIG_PPC_970_NAP=y
 CONFIG_PPC_CELL=y
+# CONFIG_PPC_CLOCK is not set
+# CONFIG_PPC_EPAPR_HV_PIC is not set
 CONFIG_PPC_ICP_HV=y
 CONFIG_PPC_ICP_NATIVE=y
 CONFIG_PPC_ICS_RTAS=y
@@ -36,8 +47,10 @@  CONFIG_PPC_ICS_RTAS=y
 CONFIG_PPC_MM_SLICES=y
 # CONFIG_PPC_MPC106 is not set
 CONFIG_PPC_P7_NAP=y
+CONFIG_PPC_RTAS=y
 CONFIG_PPC_XICS=y
 CONFIG_RCU_FANOUT=64
 CONFIG_SCHEDSTATS=y
+CONFIG_SERIAL_OF_PLATFORM=m
 CONFIG_WORD_SIZE=64
 CONFIG_ZLIB_DEFLATE=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 949a4b8..b85ed23 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -42,6 +42,7 @@  CONFIG_CRYPTO_LZO=m
 # CONFIG_DEBUG_INFO is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+# CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_DM_RAID45 is not set
 # CONFIG_DVB_FE_CUSTOMISE is not set
@@ -72,14 +73,21 @@  CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_VOODOO1=y
 CONFIG_FIRMWARE_EDID=y
+# CONFIG_FMAN_P3040_P4080_P5020 is not set
 # CONFIG_FONTS is not set
 CONFIG_FORCE_MAX_ZONEORDER=9
+# CONFIG_FSL_FMAN is not set
+# CONFIG_FSL_ULI1575 is not set
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
+# CONFIG_GE_FPGA is not set
 # CONFIG_GPIO_SYSFS is not set
 CONFIG_GPIO_TWL4030=m
 CONFIG_HAMRADIO=y
 # CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_HAS_FSL_PAMU is not set
+# CONFIG_HAS_FSL_QBMAN is not set
+# CONFIG_HAS_RAPIDIO is not set
 # CONFIG_HAVE_AOUT is not set
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
@@ -169,6 +177,7 @@  CONFIG_MPIC_U3_HT_IRQS=y
 CONFIG_MTD=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_CFI_I4 is not set
 CONFIG_MTD_CHAR=m
 CONFIG_MTD_NAND=m
 CONFIG_MTD_NAND_BCH=m
@@ -209,6 +218,8 @@  CONFIG_PPC64=y
 CONFIG_PPC_64K_PAGES=y
 CONFIG_PPC_970_NAP=y
 CONFIG_PPC_CELL=y
+# CONFIG_PPC_CLOCK is not set
+# CONFIG_PPC_EPAPR_HV_PIC is not set
 CONFIG_PPC_ICP_HV=y
 CONFIG_PPC_ICP_NATIVE=y
 CONFIG_PPC_ICS_RTAS=y
@@ -216,6 +227,7 @@  CONFIG_PPC_ICS_RTAS=y
 CONFIG_PPC_MM_SLICES=y
 # CONFIG_PPC_MPC106 is not set
 CONFIG_PPC_P7_NAP=y
+CONFIG_PPC_RTAS=y
 CONFIG_PPC_SMLPAR=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_PPC_XICS=y
@@ -259,6 +271,7 @@  CONFIG_SECURITY_TOMOYO=y
 CONFIG_SERIAL_8250=m
 CONFIG_SERIAL_8250_PCI=m
 CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_SERIAL_OF_PLATFORM=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
 CONFIG_SND_BT87X_OVERCLOCK=y
diff --git a/debian.master/control.d/vars.powerpc-e500mc b/debian.master/control.d/vars.powerpc-e500mc
new file mode 100644
index 0000000..ee90c7b
--- /dev/null
+++ b/debian.master/control.d/vars.powerpc-e500mc
@@ -0,0 +1,6 @@ 
+supported="32-bit Freescale Power e500mc"
+target="Geared toward server systems."
+desc="32-bit Freescale Power e500mc"
+bootloader="grub2-common"
+provides="redhat-cluster-modules, ivtv-modules"
+arch="powerpc"
diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index b4ee8dd..56e9455 100644
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -3,7 +3,7 @@  Section: devel
 Priority: optional
 Maintainer: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
 Standards-Version: 3.8.4.0
-Build-Depends: debhelper (>= 5), cpio, module-init-tools, kernel-wedge (>= 2.24ubuntu1), makedumpfile [amd64 i386], device-tree-compiler [powerpc], libelf-dev, libnewt-dev, binutils-dev, rsync, libdw-dev, dpkg (>= 1.16.0~ubuntu4), util-linux, pkg-config, flex, bison
+Build-Depends: debhelper (>= 5), cpio, module-init-tools, kernel-wedge (>= 2.24ubuntu1), makedumpfile [amd64 i386], device-tree-compiler [powerpc], libelf-dev, libnewt-dev, binutils-dev, rsync, libdw-dev, dpkg (>= 1.16.0~ubuntu4), util-linux, pkg-config, flex, bison, u-boot-tools [powerpc]
 Build-Depends-Indep: xmlto, docbook-utils, ghostscript, transfig, bzip2, sharutils, asciidoc
 Build-Conflicts: findutils (= 4.4.1-1ubuntu1)
 Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-precise.git
diff --git a/debian.master/d-i/kernel-versions.in b/debian.master/d-i/kernel-versions.in
index 6018d39..d7aed9c 100644
--- a/debian.master/d-i/kernel-versions.in
+++ b/debian.master/d-i/kernel-versions.in
@@ -12,3 +12,4 @@  armhf	PKGVER-ABINUM	highbank	PKGVER-ABINUM-highbank		-
 # arch	version		flavour		installedname			suffix	bdep
 powerpc	PKGVER-ABINUM	powerpc-smp	PKGVER-ABINUM-powerpc-smp	-	
 powerpc	PKGVER-ABINUM	powerpc64-smp	PKGVER-ABINUM-powerpc64-smp	-	
+powerpc PKGVER-ABINUM	powerpc-e500mc	PKGVER-ABINUM-powerpc-e500mc	-	
diff --git a/debian.master/rules.d/powerpc.mk b/debian.master/rules.d/powerpc.mk
index 3119d04..50c9e5a 100644
--- a/debian.master/rules.d/powerpc.mk
+++ b/debian.master/rules.d/powerpc.mk
@@ -2,16 +2,24 @@  human_arch	= PowerPC (32 bit userspace)
 build_arch	= powerpc
 header_arch	= $(build_arch)
 defconfig	= pmac32_defconfig
-flavours	= powerpc-smp powerpc64-smp
+flavours	= powerpc-smp powerpc-e500mc powerpc64-smp
+
+# Standard PowerPC stuff
+loader		= yaboot
 build_image	= vmlinux
 kernel_file	= $(build_image)
-install_file	= $(build_image)
 
-loader		= yaboot
+# e500mc builds, and requires an uImage, and no bootloader
+build_image_powerpc-e500mc	= uImage
+kernel_file_powerpc-e500mc	= arch/powerpc/boot/uImage
+loader_powerpc-e500mc		= NoLOADER
+
+# Always install as vmlinux
+install_file	= vmlinux
 
 custom_flavours	=
 
-no_dumpfile = true
+no_dumpfile	= true
 skipdbg		= true
 skipabi		= true
 skipmodule	= true