diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2017-04-03 20:29:35 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2017-04-03 20:29:35 +0100 |
| commit | d7144a5d3742bfdf3518407948b9bf233c1686d9 (patch) | |
| tree | f474cf7cb4f8685b8fc41bb18dbff4accdb0a655 /baseconfig | |
| parent | a849475f74fba189a9097211761507e790260a12 (diff) | |
| download | kernel-d7144a5d3742bfdf3518407948b9bf233c1686d9.tar.gz kernel-d7144a5d3742bfdf3518407948b9bf233c1686d9.tar.xz kernel-d7144a5d3742bfdf3518407948b9bf233c1686d9.zip | |
Update Amlogic meson support
Diffstat (limited to 'baseconfig')
| -rw-r--r-- | baseconfig/CONFIG_ARCH_TEGRA_186_SOC | 1 | ||||
| -rw-r--r-- | baseconfig/CONFIG_I2C_IMX_LPI2C | 1 | ||||
| -rw-r--r-- | baseconfig/CONFIG_MESON_GXL_PHY | 1 | ||||
| -rw-r--r-- | baseconfig/arm/CONFIG_DRM_MESON (renamed from baseconfig/arm/arm64/CONFIG_DRM_MESON) | 0 | ||||
| -rw-r--r-- | baseconfig/arm/CONFIG_MESON_SARADC | 1 | ||||
| -rw-r--r-- | baseconfig/arm/CONFIG_MESON_SM | 2 | ||||
| -rw-r--r-- | baseconfig/arm/arm64/CONFIG_ARCH_MESON | 1 | ||||
| -rw-r--r-- | baseconfig/arm/arm64/CONFIG_TEGRA_IVC (renamed from baseconfig/CONFIG_TEGRA_IVC) | 0 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/CONFIG_ARCH_MESON | 1 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/CONFIG_DRM_MESON | 1 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/CONFIG_MACH_MESON6 | 1 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/CONFIG_MACH_MESON8 | 1 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/CONFIG_MACH_MESON8B | 1 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/CONFIG_TEGRA_IVC | 1 |
14 files changed, 6 insertions, 7 deletions
diff --git a/baseconfig/CONFIG_ARCH_TEGRA_186_SOC b/baseconfig/CONFIG_ARCH_TEGRA_186_SOC deleted file mode 100644 index 0439db330..000000000 --- a/baseconfig/CONFIG_ARCH_TEGRA_186_SOC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_ARCH_TEGRA_186_SOC is not set diff --git a/baseconfig/CONFIG_I2C_IMX_LPI2C b/baseconfig/CONFIG_I2C_IMX_LPI2C deleted file mode 100644 index 2d866d55f..000000000 --- a/baseconfig/CONFIG_I2C_IMX_LPI2C +++ /dev/null @@ -1 +0,0 @@ -CONFIG_I2C_IMX_LPI2C=m diff --git a/baseconfig/CONFIG_MESON_GXL_PHY b/baseconfig/CONFIG_MESON_GXL_PHY deleted file mode 100644 index cc59580cc..000000000 --- a/baseconfig/CONFIG_MESON_GXL_PHY +++ /dev/null @@ -1 +0,0 @@ -CONFIG_MESON_GXL_PHY=m diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MESON b/baseconfig/arm/CONFIG_DRM_MESON index 638714333..638714333 100644 --- a/baseconfig/arm/arm64/CONFIG_DRM_MESON +++ b/baseconfig/arm/CONFIG_DRM_MESON diff --git a/baseconfig/arm/CONFIG_MESON_SARADC b/baseconfig/arm/CONFIG_MESON_SARADC new file mode 100644 index 000000000..cae134290 --- /dev/null +++ b/baseconfig/arm/CONFIG_MESON_SARADC @@ -0,0 +1 @@ +CONFIG_MESON_SARADC=m diff --git a/baseconfig/arm/CONFIG_MESON_SM b/baseconfig/arm/CONFIG_MESON_SM index e918e3e03..3cd5a9e30 100644 --- a/baseconfig/arm/CONFIG_MESON_SM +++ b/baseconfig/arm/CONFIG_MESON_SM @@ -1 +1 @@ -# CONFIG_MESON_SM is not set +CONFIG_MESON_SM=y diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_MESON b/baseconfig/arm/arm64/CONFIG_ARCH_MESON deleted file mode 100644 index 849319f60..000000000 --- a/baseconfig/arm/arm64/CONFIG_ARCH_MESON +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_ARCH_MESON is not set diff --git a/baseconfig/CONFIG_TEGRA_IVC b/baseconfig/arm/arm64/CONFIG_TEGRA_IVC index cdcacbec2..cdcacbec2 100644 --- a/baseconfig/CONFIG_TEGRA_IVC +++ b/baseconfig/arm/arm64/CONFIG_TEGRA_IVC diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_MESON b/baseconfig/arm/armv7/CONFIG_ARCH_MESON deleted file mode 100644 index 849319f60..000000000 --- a/baseconfig/arm/armv7/CONFIG_ARCH_MESON +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_ARCH_MESON is not set diff --git a/baseconfig/arm/armv7/CONFIG_DRM_MESON b/baseconfig/arm/armv7/CONFIG_DRM_MESON deleted file mode 100644 index 7a6179102..000000000 --- a/baseconfig/arm/armv7/CONFIG_DRM_MESON +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_DRM_MESON is not set diff --git a/baseconfig/arm/armv7/CONFIG_MACH_MESON6 b/baseconfig/arm/armv7/CONFIG_MACH_MESON6 new file mode 100644 index 000000000..aff440cc5 --- /dev/null +++ b/baseconfig/arm/armv7/CONFIG_MACH_MESON6 @@ -0,0 +1 @@ +# CONFIG_MACH_MESON6 is not set diff --git a/baseconfig/arm/armv7/CONFIG_MACH_MESON8 b/baseconfig/arm/armv7/CONFIG_MACH_MESON8 new file mode 100644 index 000000000..e55c72211 --- /dev/null +++ b/baseconfig/arm/armv7/CONFIG_MACH_MESON8 @@ -0,0 +1 @@ +# CONFIG_MACH_MESON8 is not set diff --git a/baseconfig/arm/armv7/CONFIG_MACH_MESON8B b/baseconfig/arm/armv7/CONFIG_MACH_MESON8B new file mode 100644 index 000000000..5212d2aca --- /dev/null +++ b/baseconfig/arm/armv7/CONFIG_MACH_MESON8B @@ -0,0 +1 @@ +CONFIG_MACH_MESON8B=y diff --git a/baseconfig/arm/armv7/CONFIG_TEGRA_IVC b/baseconfig/arm/armv7/CONFIG_TEGRA_IVC new file mode 100644 index 000000000..cdcacbec2 --- /dev/null +++ b/baseconfig/arm/armv7/CONFIG_TEGRA_IVC @@ -0,0 +1 @@ +CONFIG_TEGRA_IVC=y |