From patchwork Mon Dec 20 23:57:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 76245 X-Patchwork-Delegate: wd@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 26724B6F10 for ; Tue, 21 Dec 2010 10:50:57 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4C0D0280A5; Tue, 21 Dec 2010 00:50:55 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id imZ9r326qa4D; Tue, 21 Dec 2010 00:50:55 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5E8452809C; Tue, 21 Dec 2010 00:50:53 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 47C0D2809C for ; Tue, 21 Dec 2010 00:50:49 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Qtn4ER41Zrf0 for ; Tue, 21 Dec 2010 00:50:47 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by theia.denx.de (Postfix) with ESMTPS id 3FBEC2809B for ; Tue, 21 Dec 2010 00:50:46 +0100 (CET) Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 24A301B40C3 for ; Mon, 20 Dec 2010 23:50:43 +0000 (UTC) From: Mike Frysinger To: u-boot@lists.denx.de Date: Mon, 20 Dec 2010 18:57:09 -0500 Message-Id: <1292889429-19902-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.7.3.4 Subject: [U-Boot] [PATCH] config_cmd_defaults.h: new header for common u-boot command defaults X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de We have config_defaults.h which are random configuration settings that everyone gets by default. We also have config_cmd_default.h which is a recommended list of defaults but boards have to opt into. Now we have config_cmd_defaults.h which is a list of defaults that everyone gets and has to actively opt out of. For now, we populate it with the bootm command which previously was unable to be disabled. Signed-off-by: Mike Frysinger --- common/Makefile | 2 +- include/config_cmd_defaults.h | 14 ++++++++++++++ mkconfig | 1 + 3 files changed, 16 insertions(+), 1 deletions(-) create mode 100644 include/config_cmd_defaults.h diff --git a/common/Makefile b/common/Makefile index abea91c..048df0c 100644 --- a/common/Makefile +++ b/common/Makefile @@ -41,7 +41,7 @@ COBJS-y += xyzModem.o # core command COBJS-y += cmd_boot.o -COBJS-y += cmd_bootm.o +COBJS-$(CONFIG_CMD_BOOTM) += cmd_bootm.o COBJS-y += cmd_help.o COBJS-y += cmd_nvedit.o COBJS-y += cmd_version.o diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h new file mode 100644 index 0000000..9283daa --- /dev/null +++ b/include/config_cmd_defaults.h @@ -0,0 +1,14 @@ +/* + * config_cmd_defaults.h - sane defaults for everyone + * + * Copyright (c) 2010 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + +#ifndef _CONFIG_CMD_DEFAULTS_H_ +#define _CONFIG_CMD_DEFAULTS_H_ + +#define CONFIG_CMD_BOOTM 1 + +#endif diff --git a/mkconfig b/mkconfig index 2fda1d4..db69336 100755 --- a/mkconfig +++ b/mkconfig @@ -155,6 +155,7 @@ done cat << EOF >> config.h #define CONFIG_BOARDDIR board/$BOARDDIR +#include #include #include #include