Set NV_BUILD_KERNEL_OPTIONS as needed by the rel-34 kernel

For simplicity, refactor TARGET_TEGRA_KERNEL to contain the decimal
point, and pass that to NV_BUILD_KERNEL_OPTIONS.

Change-Id: I08311ab07358cdd1d6e180dac8230f22f8de317c

BoardConfig.mk

@@ -54,10 +54,11 @@ WITH_LINEAGE_CHARGER := false
 ifneq ($(TARGET_PREBUILT_KERNEL),)
 BOARD_VENDOR_KERNEL_MODULES += $(wildcard $(dir $(TARGET_PREBUILT_KERNEL))/*.ko)
 endif
-TARGET_KERNEL_SOURCE          := kernel/nvidia/kernel-4.9
-TARGET_KERNEL_CONFIG          := tegra_android_defconfig
-TARGET_KERNEL_RECOVERY_CONFIG := tegra_android_recovery_defconfig
-BOARD_KERNEL_IMAGE_NAME       := Image.gz
+TARGET_KERNEL_SOURCE           := kernel/nvidia/kernel-$(TARGET_TEGRA_KERNEL)
+TARGET_KERNEL_CONFIG           := tegra_android_defconfig
+TARGET_KERNEL_RECOVERY_CONFIG  := tegra_android_recovery_defconfig
+BOARD_KERNEL_IMAGE_NAME        := Image.gz
+TARGET_KERNEL_ADDITIONAL_FLAGS := "NV_BUILD_KERNEL_OPTIONS=$(TARGET_TEGRA_KERNEL)"
 
 # Recovery
 TARGET_RECOVERY_FSTAB        := device/nvidia/foster/initfiles/fstab.foster

device.mk

@@ -27,7 +27,7 @@ TARGET_TEGRA_AUDIO    ?= nvaudio
 TARGET_TEGRA_BT       ?= bcm
 TARGET_TEGRA_CAMERA   ?= nvcamera
 TARGET_TEGRA_CEC      ?= nvhdmi
-TARGET_TEGRA_KERNEL   ?= 49
+TARGET_TEGRA_KERNEL   ?= 4.9
 TARGET_TEGRA_KEYSTORE ?= nvkeystore
 TARGET_TEGRA_MEMTRACK ?= nvmemtrack
 TARGET_TEGRA_OMX      ?= nvmm
@@ -166,7 +166,7 @@ endif
 # Kernel
 ifneq ($(TARGET_PREBUILT_KERNEL),)
 TARGET_FORCE_PREBUILT_KERNEL := true
-else ifneq ($(TARGET_TEGRA_KERNEL),310)
+else ifneq ($(TARGET_TEGRA_KERNEL),3.10)
 PRODUCT_PACKAGES += \
     cypress-fmac
 endif