From 99d5108d7e29aa819daba0545d545c423bcef4cc Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 4 Apr 2018 09:42:24 -0400 Subject: Linux v4.16 --- baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_THERMAL | 1 + baseconfig/arm/armv7/armv7/CONFIG_MFD_TI_LMU | 1 + baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_IMX | 1 - baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LM363X | 1 + baseconfig/arm/armv7/armv7/CONFIG_RESET_IMX7 | 1 + baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MXC_V2 | 1 + baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP | 2 +- baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP | 1 + baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP | 2 +- baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP_CONSOLE | 1 - baseconfig/arm/armv7/armv7/CONFIG_TI_EMIF_SRAM | 1 + 11 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_THERMAL create mode 100644 baseconfig/arm/armv7/armv7/CONFIG_MFD_TI_LMU delete mode 100644 baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_IMX create mode 100644 baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LM363X create mode 100644 baseconfig/arm/armv7/armv7/CONFIG_RESET_IMX7 create mode 100644 baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MXC_V2 create mode 100644 baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP delete mode 100644 baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP_CONSOLE create mode 100644 baseconfig/arm/armv7/armv7/CONFIG_TI_EMIF_SRAM (limited to 'baseconfig/arm/armv7/armv7') diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_THERMAL b/baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_THERMAL new file mode 100644 index 000000000..ddd9d5832 --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_THERMAL @@ -0,0 +1 @@ +CONFIG_DRM_ETNAVIV_THERMAL=y diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_TI_LMU b/baseconfig/arm/armv7/armv7/CONFIG_MFD_TI_LMU new file mode 100644 index 000000000..777cb90c8 --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_MFD_TI_LMU @@ -0,0 +1 @@ +CONFIG_MFD_TI_LMU=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_IMX b/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_IMX deleted file mode 100644 index 25d1d5570..000000000 --- a/baseconfig/arm/armv7/armv7/CONFIG_POWER_RESET_IMX +++ /dev/null @@ -1 +0,0 @@ -CONFIG_POWER_RESET_IMX=y diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LM363X b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LM363X new file mode 100644 index 000000000..a4610d589 --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_LM363X @@ -0,0 +1 @@ +CONFIG_REGULATOR_LM363X=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RESET_IMX7 b/baseconfig/arm/armv7/armv7/CONFIG_RESET_IMX7 new file mode 100644 index 000000000..6718265f9 --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_RESET_IMX7 @@ -0,0 +1 @@ +CONFIG_RESET_IMX7=y diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MXC_V2 b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MXC_V2 new file mode 100644 index 000000000..225594051 --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_RTC_DRV_MXC_V2 @@ -0,0 +1 @@ +CONFIG_RTC_DRV_MXC_V2=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP index 582053b2d..0f7ea5449 100644 --- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP +++ b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP @@ -1 +1 @@ -CONFIG_SERIAL_8250_OMAP=m +CONFIG_SERIAL_8250_OMAP=y diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP new file mode 100644 index 000000000..cffbc1b84 --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP @@ -0,0 +1 @@ +CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP index 0dbd205b2..1c036ec4f 100644 --- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP +++ b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP @@ -1 +1 @@ -CONFIG_SERIAL_OMAP=y +# CONFIG_SERIAL_OMAP is not set diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP_CONSOLE b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP_CONSOLE deleted file mode 100644 index 84ab44f7f..000000000 --- a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_OMAP_CONSOLE +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SERIAL_OMAP_CONSOLE=y diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_EMIF_SRAM b/baseconfig/arm/armv7/armv7/CONFIG_TI_EMIF_SRAM new file mode 100644 index 000000000..6bb0bf6e6 --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_TI_EMIF_SRAM @@ -0,0 +1 @@ +CONFIG_TI_EMIF_SRAM=m -- cgit