diff --git a/patches/debian-armmp b/patches/debian-armmp
index 7a7a289b2201a2483369eafcc948e02bbd1a7d4e..c7bb05d610db7775c42746bb1d85da4af5f16cdf 100644
--- a/patches/debian-armmp
+++ b/patches/debian-armmp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.18.0 Kernel Configuration
+# Linux/arm 3.18.3 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -500,7 +500,12 @@ CONFIG_MACH_SUN6I=y
 CONFIG_MACH_SUN7I=y
 CONFIG_MACH_SUN8I=y
 # CONFIG_ARCH_SIRF is not set
-# CONFIG_ARCH_TEGRA is not set
+CONFIG_ARCH_TEGRA=y
+# CONFIG_ARCH_TEGRA_2x_SOC is not set
+# CONFIG_ARCH_TEGRA_3x_SOC is not set
+# CONFIG_ARCH_TEGRA_114_SOC is not set
+CONFIG_ARCH_TEGRA_124_SOC=y
+CONFIG_TEGRA_AHB=y
 # CONFIG_ARCH_U8500 is not set
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
@@ -513,6 +518,13 @@ CONFIG_ARCH_WM8850=y
 CONFIG_PLAT_ORION=y
 CONFIG_PLAT_VERSATILE=y
 CONFIG_ARM_TIMER_SP804=y
+CONFIG_ARCH_SUPPORTS_FIRMWARE=y
+CONFIG_ARCH_SUPPORTS_TRUSTED_FOUNDATIONS=y
+
+#
+# Firmware options
+#
+CONFIG_TRUSTED_FOUNDATIONS=y
 
 #
 # Processor Type
@@ -598,6 +610,7 @@ CONFIG_PCI_STUB=m
 CONFIG_PCI_MVEBU=y
 # CONFIG_PCI_EXYNOS is not set
 # CONFIG_PCI_IMX6 is not set
+CONFIG_PCI_TEGRA=y
 # CONFIG_PCI_HOST_GENERIC is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
@@ -632,7 +645,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_NR_CPUS=4
 CONFIG_HOTPLUG_CPU=y
 CONFIG_ARM_PSCI=y
-CONFIG_ARCH_NR_GPIO=512
+CONFIG_ARCH_NR_GPIO=1024
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
@@ -742,6 +755,7 @@ CONFIG_ARM_HIGHBANK_CPUFREQ=m
 CONFIG_ARM_IMX6Q_CPUFREQ=m
 # CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+CONFIG_ARM_TEGRA_CPUFREQ=y
 
 #
 # CPU Idle
@@ -1935,6 +1949,7 @@ CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_AHCI_IMX=m
 # CONFIG_AHCI_MVEBU is not set
 CONFIG_AHCI_SUNXI=m
+CONFIG_AHCI_TEGRA=m
 # CONFIG_SATA_INIC162X is not set
 CONFIG_SATA_ACARD_AHCI=m
 CONFIG_SATA_SIL24=m
@@ -2705,6 +2720,7 @@ CONFIG_KEYBOARD_MAX7359=m
 # CONFIG_KEYBOARD_MPR121 is not set
 CONFIG_KEYBOARD_IMX=m
 # CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_TEGRA=m
 CONFIG_KEYBOARD_OPENCORES=m
 # CONFIG_KEYBOARD_SAMSUNG is not set
 CONFIG_KEYBOARD_STOWAWAY=m
@@ -2828,6 +2844,7 @@ CONFIG_INPUT_TWL4030_PWRBUTTON=m
 CONFIG_INPUT_TWL4030_VIBRA=m
 CONFIG_INPUT_TWL6040_VIBRA=m
 CONFIG_INPUT_UINPUT=m
+# CONFIG_INPUT_PALMAS_PWRBUTTON is not set
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_PWM_BEEPER is not set
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
@@ -2902,6 +2919,7 @@ CONFIG_SERIAL_SAMSUNG=y
 CONFIG_SERIAL_SAMSUNG_UARTS_4=y
 CONFIG_SERIAL_SAMSUNG_UARTS=4
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_SERIAL_TEGRA=y
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX310X is not set
 CONFIG_SERIAL_MFD_HSU=m
@@ -3015,6 +3033,7 @@ CONFIG_HAVE_S3C2410_I2C=y
 CONFIG_I2C_S3C2410=y
 CONFIG_I2C_SIMTEC=m
 # CONFIG_I2C_SUN6I_P2WI is not set
+CONFIG_I2C_TEGRA=y
 CONFIG_I2C_VERSATILE=m
 # CONFIG_I2C_WMT is not set
 # CONFIG_I2C_XILINX is not set
@@ -3064,6 +3083,9 @@ CONFIG_SPI_PL022=m
 # CONFIG_SPI_SC18IS602 is not set
 # CONFIG_SPI_SUN4I is not set
 CONFIG_SPI_SUN6I=m
+# CONFIG_SPI_TEGRA114 is not set
+CONFIG_SPI_TEGRA20_SFLASH=m
+# CONFIG_SPI_TEGRA20_SLINK is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
 # CONFIG_SPI_DESIGNWARE is not set
@@ -3126,7 +3148,12 @@ CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AS3722=y
 CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINCTRL_TEGRA=y
+CONFIG_PINCTRL_TEGRA124=y
+CONFIG_PINCTRL_TEGRA_XUSB=y
+CONFIG_PINCTRL_PALMAS=y
 CONFIG_PINCTRL_IMX=y
 CONFIG_PINCTRL_IMX51=y
 CONFIG_PINCTRL_IMX53=y
@@ -3215,6 +3242,7 @@ CONFIG_GPIO_TWL6040=y
 #
 # MODULbus GPIO expanders:
 #
+CONFIG_GPIO_PALMAS=y
 
 #
 # USB GPIO expanders:
@@ -3280,6 +3308,7 @@ CONFIG_CHARGER_BQ2415X=m
 # CONFIG_CHARGER_BQ24735 is not set
 # CONFIG_CHARGER_SMB347 is not set
 CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_AS3722=y
 # CONFIG_POWER_RESET_BRCMSTB is not set
 CONFIG_POWER_RESET_GPIO=y
 # CONFIG_POWER_RESET_GPIO_RESTART is not set
@@ -3372,7 +3401,7 @@ CONFIG_SENSORS_LM95245=m
 # CONFIG_SENSORS_PC87360 is not set
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
-# CONFIG_SENSORS_NCT6683 is not set
+CONFIG_SENSORS_NCT6683=m
 CONFIG_SENSORS_NCT6775=m
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_PMBUS is not set
@@ -3437,7 +3466,10 @@ CONFIG_ARMADA_THERMAL=y
 #
 # Texas Instruments thermal drivers
 #
-# CONFIG_TI_SOC_THERMAL is not set
+CONFIG_TI_SOC_THERMAL=m
+CONFIG_TI_THERMAL=y
+CONFIG_OMAP4_THERMAL=y
+CONFIG_OMAP5_THERMAL=y
 
 #
 # Samsung thermal drivers
@@ -3465,6 +3497,7 @@ CONFIG_SUNXI_WATCHDOG=m
 CONFIG_TWL4030_WATCHDOG=m
 # CONFIG_MAX63XX_WATCHDOG is not set
 CONFIG_IMX2_WDT=m
+CONFIG_TEGRA_WATCHDOG=m
 # CONFIG_ALIM7101_WDT is not set
 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_MEN_A21_WDT is not set
@@ -3517,7 +3550,7 @@ CONFIG_BCMA_HOST_PCI=y
 #
 CONFIG_MFD_CORE=y
 # CONFIG_MFD_AS3711 is not set
-# CONFIG_MFD_AS3722 is not set
+CONFIG_MFD_AS3722=y
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_MFD_AAT2870_CORE is not set
 # CONFIG_MFD_BCM590XX is not set
@@ -3577,7 +3610,7 @@ CONFIG_MFD_TI_AM335X_TSCADC=m
 # CONFIG_MFD_LP3943 is not set
 # CONFIG_MFD_LP8788 is not set
 CONFIG_MFD_OMAP_USB_HOST=y
-# CONFIG_MFD_PALMAS is not set
+CONFIG_MFD_PALMAS=y
 # CONFIG_TPS6105X is not set
 # CONFIG_TPS65010 is not set
 # CONFIG_TPS6507X is not set
@@ -3618,11 +3651,12 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_ACT8865 is not set
 # CONFIG_REGULATOR_AD5398 is not set
 CONFIG_REGULATOR_ANATOP=m
+CONFIG_REGULATOR_AS3722=y
 CONFIG_REGULATOR_DA9052=m
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
 # CONFIG_REGULATOR_FAN53555 is not set
-# CONFIG_REGULATOR_GPIO is not set
+CONFIG_REGULATOR_GPIO=m
 # CONFIG_REGULATOR_ISL9305 is not set
 # CONFIG_REGULATOR_ISL6271A is not set
 # CONFIG_REGULATOR_LP3971 is not set
@@ -3638,13 +3672,14 @@ CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_MC13XXX_CORE=m
 CONFIG_REGULATOR_MC13783=m
 CONFIG_REGULATOR_MC13892=m
-# CONFIG_REGULATOR_PBIAS is not set
+CONFIG_REGULATOR_PALMAS=y
+CONFIG_REGULATOR_PBIAS=m
 # CONFIG_REGULATOR_PFUZE100 is not set
 # CONFIG_REGULATOR_PWM is not set
 CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
-# CONFIG_REGULATOR_TI_ABB is not set
+CONFIG_REGULATOR_TI_ABB=m
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
@@ -4261,12 +4296,15 @@ CONFIG_DVB_AF9033=m
 #
 CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_TEGRA_HOST1X=m
+CONFIG_TEGRA_HOST1X_FIREWALL=y
 CONFIG_IMX_IPUV3_CORE=m
 
 #
 # Direct Rendering Manager
 #
 CONFIG_DRM=m
+CONFIG_DRM_MIPI_DSI=y
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
@@ -4285,6 +4323,7 @@ CONFIG_DRM_I2C_NXP_TDA998X=m
 # CONFIG_DRM_R128 is not set
 # CONFIG_DRM_RADEON is not set
 CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_PLATFORM_DRIVER=m
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
@@ -4303,6 +4342,18 @@ CONFIG_DRM_OMAP_NUM_CRTCS=1
 CONFIG_DRM_TILCDC=m
 # CONFIG_DRM_QXL is not set
 # CONFIG_DRM_BOCHS is not set
+CONFIG_DRM_TEGRA=m
+CONFIG_DRM_TEGRA_FBDEV=y
+# CONFIG_DRM_TEGRA_DEBUG is not set
+# CONFIG_DRM_TEGRA_STAGING is not set
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+# CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_LD9040 is not set
+# CONFIG_DRM_PANEL_S6E8AA0 is not set
 # CONFIG_DRM_STI is not set
 
 #
@@ -4390,7 +4441,7 @@ CONFIG_OMAP2_DSS_VENC=y
 CONFIG_OMAP2_DSS_HDMI_COMMON=y
 CONFIG_OMAP4_DSS_HDMI=y
 CONFIG_OMAP4_DSS_HDMI_AUDIO=y
-# CONFIG_OMAP5_DSS_HDMI is not set
+CONFIG_OMAP5_DSS_HDMI=y
 CONFIG_OMAP2_DSS_SDI=y
 # CONFIG_OMAP2_DSS_DSI is not set
 CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
@@ -4403,9 +4454,9 @@ CONFIG_FB_OMAP2_NUM_FBS=3
 # OMAP Display Device Drivers (new device model)
 #
 # CONFIG_DISPLAY_ENCODER_TFP410 is not set
-# CONFIG_DISPLAY_ENCODER_TPD12S015 is not set
+CONFIG_DISPLAY_ENCODER_TPD12S015=m
 # CONFIG_DISPLAY_CONNECTOR_DVI is not set
-# CONFIG_DISPLAY_CONNECTOR_HDMI is not set
+CONFIG_DISPLAY_CONNECTOR_HDMI=m
 # CONFIG_DISPLAY_CONNECTOR_ANALOG_TV is not set
 # CONFIG_DISPLAY_PANEL_DPI is not set
 # CONFIG_DISPLAY_PANEL_DSI_CM is not set
@@ -4471,6 +4522,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_VMASTER=y
+CONFIG_SND_KCTL_JACK=y
 CONFIG_SND_RAWMIDI_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
 # CONFIG_SND_OPL4_LIB_SEQ is not set
@@ -4557,7 +4609,31 @@ CONFIG_SND_VIRTUOSO=m
 #
 # HD-Audio
 #
+CONFIG_SND_HDA=m
 # CONFIG_SND_HDA_INTEL is not set
+CONFIG_SND_HDA_TEGRA=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_PREALLOC_SIZE=64
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
+CONFIG_SND_HDA_INPUT_JACK=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_ARM=y
 # CONFIG_SND_ARMAACI is not set
 CONFIG_SND_SPI=y
@@ -4626,6 +4702,13 @@ CONFIG_SND_OMAP_SOC_OMAP_HDMI=m
 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
 # CONFIG_SND_KIRKWOOD_SOC is not set
 # CONFIG_SND_SOC_SAMSUNG is not set
+CONFIG_SND_SOC_TEGRA=m
+# CONFIG_SND_SOC_TEGRA_RT5640 is not set
+# CONFIG_SND_SOC_TEGRA_WM8753 is not set
+# CONFIG_SND_SOC_TEGRA_WM8903 is not set
+# CONFIG_SND_SOC_TEGRA_TRIMSLICE is not set
+# CONFIG_SND_SOC_TEGRA_ALC5632 is not set
+# CONFIG_SND_SOC_TEGRA_MAX98090 is not set
 CONFIG_SND_SOC_I2C_AND_SPI=m
 
 #
@@ -4828,6 +4911,7 @@ CONFIG_USB_EHCI_PCI=m
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_EHCI_HCD_OMAP=m
 CONFIG_USB_EHCI_HCD_ORION=m
+CONFIG_USB_EHCI_TEGRA=m
 CONFIG_USB_EHCI_EXYNOS=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 # CONFIG_USB_OXU210HP_HCD is not set
@@ -4916,6 +5000,7 @@ CONFIG_USB_DWC3_HOST=y
 #
 # Platform Glue Driver Support
 #
+CONFIG_USB_DWC3_OMAP=m
 CONFIG_USB_DWC3_EXYNOS=m
 # CONFIG_USB_DWC3_PCI is not set
 
@@ -5030,7 +5115,8 @@ CONFIG_TWL6030_USB=m
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
 CONFIG_USB_MXS_PHY=m
-# CONFIG_USB_ULPI is not set
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -5116,6 +5202,7 @@ CONFIG_MMC_RICOH_MMC=y
 CONFIG_MMC_SDHCI_PLTFM=m
 # CONFIG_MMC_SDHCI_OF_ARASAN is not set
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
+CONFIG_MMC_SDHCI_TEGRA=m
 # CONFIG_MMC_SDHCI_S3C is not set
 # CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_MMC_SDHCI_PXAV2 is not set
@@ -5255,6 +5342,7 @@ CONFIG_RTC_INTF_DEV=y
 #
 # I2C RTC drivers
 #
+CONFIG_RTC_DRV_AS3722=y
 # CONFIG_RTC_DRV_DS1307 is not set
 # CONFIG_RTC_DRV_DS1374 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
@@ -5266,6 +5354,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_ISL12022 is not set
 CONFIG_RTC_DRV_ISL12057=y
 # CONFIG_RTC_DRV_X1205 is not set
+CONFIG_RTC_DRV_PALMAS=y
 # CONFIG_RTC_DRV_PCF2127 is not set
 # CONFIG_RTC_DRV_PCF8523 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
@@ -5332,6 +5421,7 @@ CONFIG_RTC_DRV_VT8500=y
 CONFIG_RTC_DRV_SUNXI=y
 CONFIG_RTC_DRV_MV=y
 CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_TEGRA=y
 CONFIG_RTC_DRV_MXC=y
 CONFIG_RTC_DRV_SNVS=y
 # CONFIG_RTC_DRV_XGENE is not set
@@ -5354,6 +5444,7 @@ CONFIG_AMBA_PL08X=y
 CONFIG_MV_XOR=y
 CONFIG_MX3_IPU=y
 CONFIG_MX3_IPU_IRQS=4
+CONFIG_TEGRA20_APB_DMA=y
 CONFIG_TI_EDMA=y
 CONFIG_PL330_DMA=y
 CONFIG_IMX_SDMA=y
@@ -5540,6 +5631,7 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_MFD_NVEC is not set
 # CONFIG_STAGING_MEDIA is not set
 
 #
@@ -5581,6 +5673,7 @@ CONFIG_CLK_VEXPRESS_OSC=y
 # CONFIG_COMMON_CLK_SI570 is not set
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_CLK_TWL6040=m
+# CONFIG_COMMON_CLK_PALMAS is not set
 # CONFIG_COMMON_CLK_PXA is not set
 # CONFIG_COMMON_CLK_QCOM is not set
 CONFIG_MVEBU_CLK_COMMON=y
@@ -5627,6 +5720,7 @@ CONFIG_IOMMU_SUPPORT=y
 CONFIG_OF_IOMMU=y
 CONFIG_OMAP_IOMMU=y
 # CONFIG_OMAP_IOMMU_DEBUG is not set
+# CONFIG_TEGRA_IOMMU_SMMU is not set
 # CONFIG_EXYNOS_IOMMU is not set
 
 #
@@ -5656,8 +5750,19 @@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
 # DEVFREQ Drivers
 #
 # CONFIG_ARM_EXYNOS5_BUS_DEVFREQ is not set
-# CONFIG_EXTCON is not set
-# CONFIG_MEMORY is not set
+CONFIG_EXTCON=m
+
+#
+# Extcon Device Drivers
+#
+# CONFIG_EXTCON_ADC_JACK is not set
+# CONFIG_EXTCON_GPIO is not set
+CONFIG_EXTCON_PALMAS=m
+# CONFIG_EXTCON_RT8973A is not set
+# CONFIG_EXTCON_SM5502 is not set
+CONFIG_MEMORY=y
+CONFIG_TI_EMIF=m
+CONFIG_MVEBU_DEVBUS=y
 CONFIG_IIO=m
 CONFIG_IIO_BUFFER=y
 # CONFIG_IIO_BUFFER_CB is not set
@@ -5841,6 +5946,7 @@ CONFIG_PWM_SYSFS=y
 CONFIG_PWM_IMX=m
 # CONFIG_PWM_PCA9685 is not set
 # CONFIG_PWM_SAMSUNG is not set
+CONFIG_PWM_TEGRA=m
 CONFIG_PWM_TIECAP=m
 CONFIG_PWM_TIEHRPWM=m
 CONFIG_PWM_TIPWMSS=y
@@ -6622,7 +6728,7 @@ CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
 CONFIG_CORDIC=m
-# CONFIG_DDR is not set
+CONFIG_DDR=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=m
 CONFIG_FONT_SUPPORT=y
diff --git a/version.sh b/version.sh
index ecf99b6df64f2ed31c5541ddb1725929c6aa6b44..5d7f5e25f9858215481c55fef62240b10218909e 100644
--- a/version.sh
+++ b/version.sh
@@ -1,12 +1,7 @@
 #!/bin/sh
 #
 ARCH=$(uname -m)
-
-if [ $(which nproc) ] ; then
-	CORES=$(nproc)
-else
-	CORES=1
-fi
+CORES=$(getconf _NPROCESSORS_ONLN)
 
 #Debian 7 (Wheezy): git version 1.7.10.4 and later needs "--no-edit"
 unset git_opts
@@ -30,6 +25,7 @@ KERNEL_TAG=${KERNEL_REL}-rc5
 BUILD=bone2
 
 #v3.X-rcX + upto SHA
+#prev_KERNEL_SHA=""
 #KERNEL_SHA=""
 
 #git branch