From 8510350ef33527dea47e7c723034266cb173f666 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Mon, 20 Jul 2015 07:32:33 -0600 Subject: [PATCH V/W SRU] UBUNTU: [Config] ACORN_PARTITION=n BugLink: http://bugs.launchpad.net/bugs/1453117 Commit 50365c57860cd931c2d806057e0987634797e9af ([ARM] Make Acorn partition types depend on ACORN_PARTITION) fixed some configuration issues, but also removed the dependency on ARCH_ACORN. The partition detection logic has been getting false positives on non-Acorn systems, so disable it. Signed-off-by: Tim Gardner --- debian.master/config/annotations | 14 +++++++------- debian.master/config/config.common.ubuntu | 8 +------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 73be593..52624b2 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -2486,13 +2486,13 @@ set +tree 'Enable the block layer>>Partition Types' ?pattern _DISKLABEL$ !flag E # Menu: Enable the block layer >> Partition Types >> Advanced partition selection CONFIG_PARTITION_ADVANCED y -# Menu: Enable the block layer >> Partition Types >> Advanced partition selection >> Acorn partition support -CONFIG_ACORN_PARTITION_CUMANA D -CONFIG_ACORN_PARTITION_EESOX D -CONFIG_ACORN_PARTITION_ICS D -CONFIG_ACORN_PARTITION_ADFS D -CONFIG_ACORN_PARTITION_POWERTEC D -CONFIG_ACORN_PARTITION_RISCIX D +# Menu: Disable the block layer >> Partition Types >> Advanced partition selection >> Acorn partition support +CONFIG_ACORN_PARTITION_CUMANA n +CONFIG_ACORN_PARTITION_EESOX n +CONFIG_ACORN_PARTITION_ICS n +CONFIG_ACORN_PARTITION_ADFS n +CONFIG_ACORN_PARTITION_POWERTEC n +CONFIG_ACORN_PARTITION_RISCIX n # Menu: Enable the block layer >> Partition Types >> Advanced partition selection >> PC BIOS (MSDOS partition tables) support CONFIG_MINIX_SUBPARTITION y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 0e362a2..666a268 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -32,13 +32,7 @@ CONFIG_ACENIC=m # CONFIG_ACENIC_OMIT_TIGON_I is not set CONFIG_ACERHDF=m CONFIG_ACER_WMI=m -CONFIG_ACORN_PARTITION=y -CONFIG_ACORN_PARTITION_ADFS=y -CONFIG_ACORN_PARTITION_CUMANA=y -CONFIG_ACORN_PARTITION_EESOX=y -CONFIG_ACORN_PARTITION_ICS=y -CONFIG_ACORN_PARTITION_POWERTEC=y -CONFIG_ACORN_PARTITION_RISCIX=y +# CONFIG_ACORN_PARTITION is not set CONFIG_ACPI=y CONFIG_ACPI_AC=y CONFIG_ACPI_APEI=y -- 1.9.1