chromeos: config: tegra11x: Disable USE_OF

This kernel isn't ready for device tree with ChromeOS builds yet.  Recent
changes to GPIOs expects to get GPIO information from the DTB, which
isn't present, causing boot to fail.  Disabling USE_OF allows boot to
complete by following legacy init paths.

Change-Id: I479d11009436057d0c8b004f90314b325538ab4e
Signed-off-by: Andrew Chew <achew@nvidia.com>
Reviewed-on: http://git-master/r/190125
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Allen Martin <amartin@nvidia.com>

7 files changed, 62 insertions, 21 deletions

diff --git a/chromeos/config/armel/chromeos-exynos5.flavour.config b/chromeos/config/armel/chromeos-exynos5.flavour.config
index 11b11d16e310..a83887ec47ee 100644
--- a/chromeos/config/armel/chromeos-exynos5.flavour.config
+++ b/chromeos/config/armel/chromeos-exynos5.flavour.config
@@ -171,6 +171,7 @@ CONFIG_DRM_EXYNOS_HDMI=y
 CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 # CONFIG_DRM_UDL is not set
+CONFIG_DTC=y
 # CONFIG_DUMMY is not set
 # CONFIG_DW_DMAC is not set
 # CONFIG_DW_WATCHDOG is not set
@@ -459,7 +460,19 @@ CONFIG_NR_CPUS=2
 # CONFIG_NTFS_FS is not set
 CONFIG_OABI_COMPAT=y
 # CONFIG_OC_ETM is not set
+CONFIG_OF=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_DEVICE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_I2C=y
+CONFIG_OF_IOMMU=y
+CONFIG_OF_IRQ=y
 CONFIG_OF_MDIO=y
+CONFIG_OF_NET=y
+# CONFIG_OF_SELFTEST is not set
+CONFIG_OF_SPI=y
 CONFIG_OLD_MCOUNT=y
 # CONFIG_OPROFILE is not set
 CONFIG_PAGE_OFFSET=0x80000000
@@ -569,6 +582,7 @@ CONFIG_SENSORS_S3C=y
 CONFIG_SENSORS_S3C_RAW=y
 CONFIG_SENSORS_TSL2563=m
 # CONFIG_SERIAL_8250_CONSOLE is not set
+# CONFIG_SERIAL_8250_DW is not set
 # CONFIG_SERIAL_AMBA_PL010 is not set
 # CONFIG_SERIAL_AMBA_PL011 is not set
 # CONFIG_SERIAL_OF_PLATFORM is not set
@@ -701,6 +715,7 @@ CONFIG_USB_VIDEO_CLASS=m
 # CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV is not set
 # CONFIG_USB_WDM is not set
 CONFIG_USER_NS=y
+CONFIG_USE_OF=y
 CONFIG_UTS_NS=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
diff --git a/chromeos/config/armel/chromeos-tegra11.flavour.config b/chromeos/config/armel/chromeos-tegra11.flavour.config
index dd8a7fca4a5c..5be2d9ac08dd 100644
--- a/chromeos/config/armel/chromeos-tegra11.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra11.flavour.config
@@ -25,7 +25,6 @@ CONFIG_ARCH_TEGRA_HAS_CL_DVFS=y
 CONFIG_ARCH_TEGRA_HAS_DUAL_CPU_CLUSTERS=y
 CONFIG_ARCH_TEGRA_HAS_SYMMETRIC_CPU_PWR_GATE=y
 # CONFIG_ARCNET is not set
-# CONFIG_ARM_APPENDED_DTB is not set
 CONFIG_ARM_ARCH_TIMER=y
 # CONFIG_ARM_ERRATA_716044 is not set
 # CONFIG_ARM_ERRATA_720789 is not set
@@ -378,7 +377,6 @@ CONFIG_INPUT_GPIO=y
 CONFIG_INPUT_JOYDEV=y
 CONFIG_INPUT_KEYRESET=y
 # CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_OF_MATRIX_KEYMAP=y
 # CONFIG_INPUT_PWM_BEEPER is not set
 CONFIG_INPUT_UINPUT=y
 # CONFIG_INTEL_MID_PTI is not set
@@ -741,8 +739,6 @@ CONFIG_NVMAP_PAGE_POOL_SIZE=0x0
 CONFIG_NVMAP_RECLAIM_UNPINNED_VM=y
 # CONFIG_NVMAP_VPR is not set
 # CONFIG_OABI_COMPAT is not set
-CONFIG_OF_PCI=y
-CONFIG_OF_PCI_IRQ=y
 CONFIG_OPROFILE=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
@@ -790,7 +786,6 @@ CONFIG_PREEMPT_RCU=y
 # CONFIG_PREEMPT_TRACER is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PRISM54 is not set
-CONFIG_PROC_DEVICETREE=y
 # CONFIG_PSTORE is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_QLCNIC is not set
@@ -907,7 +902,6 @@ CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 # CONFIG_SERIAL_MFD_HSU is not set
-# CONFIG_SERIAL_OF_PLATFORM is not set
 # CONFIG_SERIAL_PCH_UART is not set
 CONFIG_SERIAL_TEGRA=y
 # CONFIG_SERIO_PCIPS2 is not set
@@ -1270,6 +1264,7 @@ CONFIG_USB_WDM=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 # CONFIG_USB_ZERO is not set
+# CONFIG_USE_OF is not set
 # CONFIG_UWB is not set
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
 CONFIG_V4L_PCI_DRIVERS=y
diff --git a/chromeos/config/armel/chromeos-tegra2.flavour.config b/chromeos/config/armel/chromeos-tegra2.flavour.config
index e6f19456ced0..8054249e2732 100644
--- a/chromeos/config/armel/chromeos-tegra2.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra2.flavour.config
@@ -194,6 +194,7 @@ CONFIG_DM_BUFIO=y
 CONFIG_DM_VERITY=y
 # CONFIG_DNS_RESOLVER is not set
 # CONFIG_DRM is not set
+CONFIG_DTC=y
 # CONFIG_DUMMY is not set
 # CONFIG_DX_SEP is not set
 # CONFIG_DYNAMIC_DEBUG is not set
@@ -616,9 +617,21 @@ CONFIG_NVMAP_PAGE_POOL_SIZE=0x0
 CONFIG_NVMAP_RECLAIM_UNPINNED_VM=y
 # CONFIG_NVMAP_VPR is not set
 # CONFIG_OABI_COMPAT is not set
+CONFIG_OF=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_DEVICE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_I2C=y
+CONFIG_OF_IOMMU=y
+CONFIG_OF_IRQ=y
 CONFIG_OF_MDIO=y
+CONFIG_OF_NET=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
+# CONFIG_OF_SELFTEST is not set
+CONFIG_OF_SPI=y
 CONFIG_OLD_MCOUNT=y
 # CONFIG_OPROFILE is not set
 CONFIG_OUTER_CACHE=y
@@ -784,6 +797,7 @@ CONFIG_SENSORS_TSL2563=m
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT8231 is not set
 CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_DW is not set
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
@@ -1065,6 +1079,7 @@ CONFIG_USB_VIDEO_CLASS=m
 # CONFIG_USB_WDM is not set
 # CONFIG_USB_XHCI_HCD is not set
 CONFIG_USER_NS=y
+CONFIG_USE_OF=y
 CONFIG_UTS_NS=y
 # CONFIG_UWB is not set
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
diff --git a/chromeos/config/armel/chromeos-tegra3.flavour.config b/chromeos/config/armel/chromeos-tegra3.flavour.config
index ff2a987eefb2..688d973ecf25 100644
--- a/chromeos/config/armel/chromeos-tegra3.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra3.flavour.config
@@ -218,6 +218,7 @@ CONFIG_DM_UEVENT=y
 # CONFIG_DM_VERITY is not set
 CONFIG_DNS_RESOLVER=y
 # CONFIG_DRM is not set
+CONFIG_DTC=y
 CONFIG_DUMMY=y
 # CONFIG_DX_SEP is not set
 # CONFIG_DYNAMIC_DEBUG is not set
@@ -791,8 +792,20 @@ CONFIG_NVMAP_PAGE_POOL_SIZE=0x0
 CONFIG_NVMAP_RECLAIM_UNPINNED_VM=y
 # CONFIG_NVMAP_VPR is not set
 # CONFIG_OABI_COMPAT is not set
+CONFIG_OF=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_DEVICE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_I2C=y
+CONFIG_OF_IOMMU=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_NET=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
+# CONFIG_OF_SELFTEST is not set
+CONFIG_OF_SPI=y
 CONFIG_OLD_MCOUNT=y
 CONFIG_OPROFILE=y
 CONFIG_OUTER_CACHE=y
@@ -972,6 +985,7 @@ CONFIG_SENSORS_TEGRA_TSENSOR=y
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT8231 is not set
 CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_DW is not set
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
@@ -1390,6 +1404,7 @@ CONFIG_USB_WDM=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 # CONFIG_USB_ZERO is not set
+CONFIG_USE_OF=y
 # CONFIG_UWB is not set
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
 CONFIG_V4L_PCI_DRIVERS=y
diff --git a/chromeos/config/armel/chromiumos-arm.flavour.config b/chromeos/config/armel/chromiumos-arm.flavour.config
index ee76e4c5080b..05ef2a252df8 100644
--- a/chromeos/config/armel/chromiumos-arm.flavour.config
+++ b/chromeos/config/armel/chromiumos-arm.flavour.config
@@ -194,6 +194,7 @@ CONFIG_DM_BUFIO=y
 CONFIG_DM_VERITY=y
 # CONFIG_DNS_RESOLVER is not set
 # CONFIG_DRM is not set
+CONFIG_DTC=y
 # CONFIG_DUMMY is not set
 # CONFIG_DX_SEP is not set
 # CONFIG_DYNAMIC_DEBUG is not set
@@ -616,9 +617,21 @@ CONFIG_NVMAP_PAGE_POOL_SIZE=0x0
 CONFIG_NVMAP_RECLAIM_UNPINNED_VM=y
 # CONFIG_NVMAP_VPR is not set
 # CONFIG_OABI_COMPAT is not set
+CONFIG_OF=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_DEVICE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_I2C=y
+CONFIG_OF_IOMMU=y
+CONFIG_OF_IRQ=y
 CONFIG_OF_MDIO=y
+CONFIG_OF_NET=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
+# CONFIG_OF_SELFTEST is not set
+CONFIG_OF_SPI=y
 CONFIG_OLD_MCOUNT=y
 # CONFIG_OPROFILE is not set
 CONFIG_OUTER_CACHE=y
@@ -784,6 +797,7 @@ CONFIG_SENSORS_TSL2563=m
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT8231 is not set
 CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_DW is not set
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
@@ -1065,6 +1079,7 @@ CONFIG_USB_VIDEO_CLASS=m
 # CONFIG_USB_WDM is not set
 # CONFIG_USB_XHCI_HCD is not set
 CONFIG_USER_NS=y
+CONFIG_USE_OF=y
 CONFIG_UTS_NS=y
 # CONFIG_UWB is not set
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config
index c301be33fd4f..05de402b7cf3 100644
--- a/chromeos/config/armel/common.config
+++ b/chromeos/config/armel/common.config
@@ -120,7 +120,6 @@ CONFIG_CPU_V7=y
 # CONFIG_DEBUG_RODATA is not set
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 # CONFIG_DM9000 is not set
-CONFIG_DTC=y
 # CONFIG_EEPROM_93CX6 is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENC28J60 is not set
@@ -196,18 +195,6 @@ CONFIG_NET_VENDOR_SMSC=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NF_CONNTRACK_PROCFS=y
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_OF=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_DEVICE=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_I2C=y
-CONFIG_OF_IOMMU=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
-# CONFIG_OF_SELFTEST is not set
-CONFIG_OF_SPI=y
 CONFIG_PERF_USE_VMALLOC=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 # CONFIG_PLAT_SPEAR is not set
@@ -247,7 +234,6 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SEEQ8005 is not set
 # CONFIG_SENSORS_LIS3_SPI is not set
 CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DW is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
@@ -268,7 +254,6 @@ CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_USB_HSO is not set
 # CONFIG_USB_NET_NET1080 is not set
 # CONFIG_USB_STORAGE_REALTEK is not set
-CONFIG_USE_OF=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_VFP=y
 CONFIG_VFPv3=y
diff --git a/chromeos/config/base.config b/chromeos/config/base.config
index b25d693feece..a77eaa8429ae 100644
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -752,6 +752,7 @@ CONFIG_MD=y
 CONFIG_MII=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_MIPI_BIF is not set
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_MMC_BKOPS is not set
 CONFIG_MMC_BLOCK_BOUNCE=y