From patchwork Sun Oct 2 21:11:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 4465 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 8AA6A23EF6 for ; Sun, 2 Oct 2011 21:12:06 +0000 (UTC) Received: from mail-bw0-f52.google.com (mail-bw0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 713FEA180B7 for ; Sun, 2 Oct 2011 21:12:06 +0000 (UTC) Received: by bke5 with SMTP id 5so6106000bke.11 for ; Sun, 02 Oct 2011 14:12:06 -0700 (PDT) Received: by 10.223.26.26 with SMTP id b26mr4979998fac.122.1317589925994; Sun, 02 Oct 2011 14:12:05 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.3.234 with SMTP id f10cs30273laf; Sun, 2 Oct 2011 14:12:04 -0700 (PDT) Received: by 10.204.154.195 with SMTP id p3mr8831409bkw.204.1317589923165; Sun, 02 Oct 2011 14:12:03 -0700 (PDT) Received: from mail.df.lth.se (mail.df.lth.se. [194.47.250.12]) by mx.google.com with ESMTPS id b13si6321738bka.112.2011.10.02.14.12.02 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 02 Oct 2011 14:12:03 -0700 (PDT) Received-SPF: pass (google.com: domain of triad@df.lth.se designates 194.47.250.12 as permitted sender) client-ip=194.47.250.12; Authentication-Results: mx.google.com; spf=pass (google.com: domain of triad@df.lth.se designates 194.47.250.12 as permitted sender) smtp.mail=triad@df.lth.se Received: from mer.df.lth.se (mer.df.lth.se [194.47.250.37]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.df.lth.se (Postfix) with ESMTPS id 84E3365DF4; Sun, 2 Oct 2011 23:12:01 +0200 (CEST) Received: from mer.df.lth.se (triad@localhost.localdomain [127.0.0.1]) by mer.df.lth.se (8.14.3/8.14.3/Debian-9.4) with ESMTP id p92LC19s032012; Sun, 2 Oct 2011 23:12:01 +0200 Received: (from triad@localhost) by mer.df.lth.se (8.14.3/8.14.3/Submit) id p92LC0XP032011; Sun, 2 Oct 2011 23:12:00 +0200 From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Linus Walleij Subject: [PATCH] mach-integrator: remove VGA_CONSOLE from defconfig Date: Sun, 2 Oct 2011 23:11:55 +0200 Message-Id: <1317589915-31984-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.7.2.5 After scratching my head for a while fighting strange boot delays and hangs, I realized that the VGA_CONSOLE code is just poking around in the PCI memory space at random. It really has no clue whether there is a VGA card in the first slot or not, and it doesn't in any way try to determine if there is one. It doesn't belong in the defconfig, people with VGA cards in their Integrators can reenable this and fix it properly. Signed-off-by: Linus Walleij --- arch/arm/configs/integrator_defconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig index 1103f62..f26460d 100644 --- a/arch/arm/configs/integrator_defconfig +++ b/arch/arm/configs/integrator_defconfig @@ -66,6 +66,7 @@ CONFIG_FB_MODE_HELPERS=y CONFIG_FB_MATROX=y CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y +# CONFIG_VGA_CONSOLE is not set CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_PL030=y CONFIG_EXT2_FS=y