: Add <configs/omap3_common.h>
cover : Add <configs/omap3_common.h>
Hey all,
Here's something I've talked about a bit before. This series adds include/configs/omap3_common.h and makes all CONFIG_OMAP34XX boards use it. This particular round of posting doesn't directly apply as I'm working off of a series of cleanups that I'll post once I'm sure I don't find any others from doing this (unused CONFIG options) general series. What I'm really looking for is feedback on the implementation, namely what I lay out in the first patch of a section to set before using omap3_common.h, including, and a section for after omap3_common.h. The series isn't nearly complete but introduces at least one example of a "our board isn't like all the others" in each of the sections.
I think the diffstat illustrates why we need to do something here.
include/configs/am3517_crane.h | 91 ++++------------------ include/configs/am3517_evm.h | 90 ++++------------------ include/configs/cm_t35.h | 99 ++++-------------------- include/configs/devkit8000.h | 87 ++++----------------- include/configs/dig297.h | 100 ++++--------------------- include/configs/igep00x0.h | 78 ++++--------------- include/configs/mcx.h | 93 ++++------------------- include/configs/mt_ventoux.h | 13 +++ include/configs/omap3_beagle.h | 97 ++++-------------------- include/configs/omap3_common.h | 131 +++++++++++++++++++++++++++++++++ include/configs/omap3_evm.h | 19 ---- include/configs/omap3_evm_common.h | 75 +++--------------- include/configs/omap3_evm_quick_mmc.h | 13 +-- include/configs/omap3_evm_quick_nand.h | 8 +- include/configs/omap3_logic.h | 103 ++++--------------------- include/configs/omap3_mvblx.h | 93 ++++++----------------- include/configs/omap3_overo.h | 94 ++++------------------- include/configs/omap3_pandora.h | 94 ++++------------------- include/configs/omap3_sdp3430.h | 107 ++++++-------------------- include/configs/omap3_zoom1.h | 94 ++++------------------- include/configs/omap3_zoom2.h | 83 ++++---------------- include/configs/tam3517-common.h | 89 ++++------------------ include/configs/tricorder.h | 86 ++++----------------- include/configs/twister.h | 14 +++ 24 files changed, 486 insertions(+), 1365 deletions(-)
Signature · 1 line
Tom
RFC 1/11 omap3+: Introduce <configs/omap3_common.h>
This is a common file for OMAP3 (and OMAP3-alike) platforms to have default, configurable when needed values and choices placed. All users of this file now have a section for providing their overrides (when the defaults are not wanted), this file, and then a place to opt-out of choices this file has made.
Signed-off-by Tom Rini <[email protected]>
--- include/configs/am3517_crane.h | 19 +++++++++----- include/configs/am3517_evm.h | 20 ++++++++++----- include/configs/cm_t35.h | 22 +++++++++++------ include/configs/devkit8000.h | 24 ++++++++++++------ include/configs/dig297.h | 22 +++++++++++------ include/configs/igep00x0.h | 19 ++++++++------ include/configs/mcx.h | 24 +++++++++++-------- include/configs/mt_ventoux.h | 13 ++++++++++ include/configs/omap3_beagle.h | 19 +++++++++----- include/configs/omap3_common.h | 40 ++++++++++++++++++++++++++++++++ include/configs/omap3_evm.h | 3 -- include/configs/omap3_evm_common.h | 15 ++++++++--- include/configs/omap3_evm_quick_mmc.h | 7 +++-- include/configs/omap3_evm_quick_nand.h | 7 +++-- include/configs/omap3_logic.h | 20 ++++++++++----- include/configs/omap3_mvblx.h | 23 +++++++++++------- include/configs/omap3_overo.h | 19 +++++++++----- include/configs/omap3_pandora.h | 19 +++++++++----- include/configs/omap3_sdp3430.h | 38 ++++++++++++++++-------------- include/configs/omap3_zoom1.h | 19 +++++++++----- include/configs/omap3_zoom2.h | 19 +++++++++----- include/configs/tam3517-common.h | 21 ++++++++++------ include/configs/tricorder.h | 23 ++++++++++++------ include/configs/twister.h | 14 +++++++++++ 24 files changed, 315 insertions(+), 154 deletions(-) create mode 100644 include/configs/omap3_common.h
include/configs/am3517_crane.h +12 -7
@@ -26,16 +26,21 @@#define __CONFIG_H/* -* High Level Configuration Options +* Values that differ from platform defaults or are unspecified. */ -#define CONFIG_OMAP 1/* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1/* which is a 34XX */ -#define CONFIG_OMAP3_AM3517CRANE 1/* working with CRANEBOARD */ +#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ -#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ +/* Platform defaults */ +#include <configs/omap3_common.h> -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +/* +* Override the common platform file choices. +*/ + +/* +* Other configuration options +*/ +#define CONFIG_OMAP3_AM3517CRANE /* working with CRANEBOARD */ /* * Display CPU and Board information
include/configs/am3517_evm.h +13 -7
@@ -26,16 +26,22 @@#define __CONFIG_H/* -* High Level Configuration Options +* Values that differ from platform defaults or are unspecified. */ -#define CONFIG_OMAP 1/* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1/* which is a 34XX */ -#define CONFIG_OMAP3_AM3517EVM 1/* working with AM3517EVM */ +#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ -#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ +/* Platform defaults */ +#include <configs/omap3_common.h> + +/* +* Override the common platform file choices. +*/ + +/* +* Other configuration options +*/ +#define CONFIG_OMAP3_AM3517EVM /* working with AM3517EVM */ -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> /* * Display CPU and Board information
include/configs/cm_t35.h +14 -8
@@ -33,18 +33,24 @@#define __CONFIG_H/* -* High Level Configuration Options +* Values that differ from platform defaults or are unspecified. */ -#define CONFIG_OMAP /* in a TI OMAP core */ -#define CONFIG_OMAP34XX /* which is a 34XX */ -#define CONFIG_CM_T3X /* working with CM-T35 and CM-T3730 */ +#define CONFIG_SDRC /* The chip has SDRC controller */ -#define CONFIG_SYS_TEXT_BASE 0x80008000 +/* Platform defaults */ +#include <configs/omap3_common.h> + +/* +* Override the common platform file choices. +*/ -#define CONFIG_SDRC /* The chip has SDRC controller */ +/* +* Other configuration options +*/ +#define CONFIG_CM_T3X /* working with CM-T35 and CM-T3730 */ + +#define CONFIG_SYS_TEXT_BASE 0x80008000 -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> /* * Display CPU and Board information
include/configs/devkit8000.h +16 -8
@@ -31,10 +31,22 @@#ifndef __CONFIG_H#define __CONFIG_H -/* High Level Configuration Options */ -#define CONFIG_OMAP 1/* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1/* which is a 34XX */ -#define CONFIG_OMAP3_DEVKIT8000 1/* working with DevKit8000 */ +/* +* Values that differ from platform defaults or are unspecified. +*/ +#define CONFIG_SDRC /* The chip has SDRC controller */ + +/* Platform defaults */ +#include <configs/omap3_common.h> + +/* +* Override the common platform file choices. +*/ + +/* +* Other configuration options +*/ +#define CONFIG_OMAP3_DEVKIT8000 /* working with DevKit8000 */ /* * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM
@@ -44,10 +56,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80100000 -#define CONFIG_SDRC /* The chip has SDRC controller */ - -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> /* Display CPU and Board information */ #define CONFIG_DISPLAY_CPUINFO 1
include/configs/dig297.h +14 -8
@@ -38,20 +38,26 @@#else #define MACH_TYPE_OMAP3_CPS 2751#endif -#define CONFIG_MACH_TYPE MACH_TYPE_OMAP3_CPS/* -* High Level Configuration Options +* Values that differ from platform defaults or are unspecified. */ -#define CONFIG_OMAP /* in a TI OMAP core */ -#define CONFIG_OMAP34XX /* which is a 34XX */ +#define CONFIG_SDRC /* The chip has SDRC controller */ -#define CONFIG_SYS_TEXT_BASE 0x80008000 +/* Platform defaults */ +#include <configs/omap3_common.h> + +/* +* Override the common platform file choices. +*/ -#define CONFIG_SDRC /* The chip has SDRC controller */ +/* +* Other configuration options +*/ +#define CONFIG_MACH_TYPE MACH_TYPE_OMAP3_CPS + +#define CONFIG_SYS_TEXT_BASE 0x80008000 -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> /* * Display CPU and Board information
include/configs/igep00x0.h +11 -8
@@ -23,18 +23,21 @@#ifndef __IGEP00X0_H#define __IGEP00X0_H -#include <asm/sizes.h> -/* -* High Level Configuration Options +* Values that differ from platform defaults or are unspecified. */ -#define CONFIG_OMAP 1/* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1/* which is a 34XX */ +#define CONFIG_SDRC /* The chip has SDRC controller */ + +/* Platform defaults */ +#include <configs/omap3_common.h> -#define CONFIG_SDRC /* The chip has SDRC controller */ +/* +* Override the common platform file choices. +*/ -#include <asm/arch/cpu.h> -#include <asm/arch/omap3.h> +/* +* Other configuration options +*/ /* * Display CPU and Board information
include/configs/mcx.h +14 -10
@@ -22,21 +22,25 @@#define __CONFIG_H/* -* High Level Configuration Options +* Values that differ from platform defaults or are unspecified. */ -#define CONFIG_OMAP /* in a TI OMAP core */ -#define CONFIG_OMAP34XX /* which is a 34XX */ -#define CONFIG_OMAP3_MCX /* working with mcx */ +#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ -#define MACH_TYPE_MCX 3656 -#define CONFIG_MACH_TYPE MACH_TYPE_MCX +/* Platform defaults */ +#include <configs/omap3_common.h> -#define CONFIG_SYS_CACHELINE_SIZE 64 +/* +* Override the common platform file choices. +*/ -#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ +/* +* Other configuration options +*/ +#define CONFIG_OMAP3_MCX /* working with mcx */ +#define MACH_TYPE_MCX 3656 +#define CONFIG_MACH_TYPE MACH_TYPE_MCX -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#define CONFIG_SYS_CACHELINE_SIZE 64#define CONFIG_OF_LIBFDT #define CONFIG_FIT
include/configs/mt_ventoux.h +13 -0
@@ -22,8 +22,21 @@#ifndef __CONFIG_H#define __CONFIG_H + +/* +* Values that differ from platform defaults or are unspecified. +*/ + +/* Platform defaults */ #include "tam3517-common.h" +/* +* Override the common platform file choices. +*/ + +/* +* Other configuration options +*/ #define MACH_TYPE_AM3517_MT_VENTOUX 3832#define CONFIG_MACH_TYPE MACH_TYPE_AM3517_MT_VENTOUX
include/configs/omap3_beagle.h +12 -7
@@ -29,16 +29,21 @@#define __CONFIG_H/* -* High Level Configuration Options +* Values that differ from platform defaults or are unspecified. */ -#define CONFIG_OMAP 1/* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1/* which is a 34XX */ -#define CONFIG_OMAP3_BEAGLE 1/* working with BEAGLE */ +#define CONFIG_SDRC /* The chip has SDRC controller */ -#define CONFIG_SDRC /* The chip has SDRC controller */ +/* Platform defaults */ +#include <configs/omap3_common.h> -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +/* +* Override the common platform file choices. +*/ + +/* +* Other configuration options +*/ +#define CONFIG_OMAP3_BEAGLE /* working with BEAGLE */ /* * Display CPU and Board information
include/configs/omap3_common.h new file +40 -0
@@ -0,0 +1,40 @@ +/* +* (C) Copyright 2012 +* Texas Instruments Incorporated. +* Tom Rini <[email protected]> +* +* TI OMAP3 (and AM/DM related parts) common configuration settings +* +* See file CREDITS for list of people who contributed to this +* project. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* MA 02111-1307 USA +*/ + +#ifndef __CONFIG_OMAP3_COMMON_H +#define __CONFIG_OMAP3_COMMON_H + +/* +* A TI OMAP3 (or similar) core +*/ +#define CONFIG_OMAP +#define CONFIG_OMAP34XX + +/* Get CPU defs */ +#include <asm/arch/cpu.h> +#include <asm/arch/omap3.h> + +#endif /* __CONFIG_OMAP3_COMMON_H */
include/configs/omap3_evm.h +0 -3
@@ -33,9 +33,6 @@#ifndef __OMAP3EVM_CONFIG_H#define __OMAP3EVM_CONFIG_H -#include <asm/arch/cpu.h> -#include <asm/arch/omap3.h> -/* ---------------------------------------------------------------------------- * Supported U-boot commands * ----------------------------------------------------------------------------
include/configs/omap3_evm_common.h +11 -4
@@ -18,13 +18,20 @@#define __OMAP3_EVM_COMMON_H/* -* High level configuration options +* Values that differ from platform defaults or are unspecified. */ -#define CONFIG_OMAP /* This is TI OMAP core */ -#define CONFIG_OMAP34XX /* belonging to 34XX family */ -#define CONFIG_SDRC /* The chip has SDRC controller */ +/* Platform defaults */ +#include <configs/omap3_common.h> + +/* +* Override the common platform file choices. +*/ + +/* +* Other configuration options +*/ #define CONFIG_OMAP3_EVM /* This is a OMAP3 EVM */ #define CONFIG_TWL4030_POWER /* with TWL4030 PMIC */
include/configs/omap3_evm_quick_mmc.h +4 -3
@@ -20,9 +20,6 @@#ifndef __OMAP3_EVM_QUICK_MMC_H#define __OMAP3_EVM_QUICK_MMC_H -#include <asm/arch/cpu.h> -#include <asm/arch/omap3.h> -/* ---------------------------------------------------------------------------- * Supported U-boot commands * ----------------------------------------------------------------------------
@@ -62,6 +59,10 @@*/ #include "omap3_evm_common.h" +/* +* Override the common platform file choices. +*/ +/* ----------------------------------------------------------------------------- * Default environment * -----------------------------------------------------------------------------
include/configs/omap3_evm_quick_nand.h +4 -3
@@ -20,9 +20,6 @@#ifndef __OMAP3_EVM_QUICK_NAND_H#define __OMAP3_EVM_QUICK_NAND_H -#include <asm/arch/cpu.h> -#include <asm/arch/omap3.h> -/* ---------------------------------------------------------------------------- * Supported U-boot commands * ----------------------------------------------------------------------------
@@ -50,6 +47,10 @@*/ #include "omap3_evm_common.h" +/* +* Override the common platform file choices. +*/ +/* ----------------------------------------------------------------------------- * Default environment * -----------------------------------------------------------------------------
include/configs/omap3_logic.h +13 -7
@@ -28,20 +28,26 @@#define __CONFIG_H/* -* High Level Configuration Options +* Values that differ from platform defaults or are unspecified. +*/ +#define CONFIG_SDRC /* The chip has SDRC controller */ + +/* Platform defaults */ +#include <configs/omap3_common.h> + +/* +* Override the common platform file choices. +*/ + +/* +* Other configuration options */ -#define CONFIG_OMAP /* in a TI OMAP core */ -#define CONFIG_OMAP34XX /* which is a 34XX */ #define CONFIG_OMAP3_LOGIC /* working with Logic OMAP boards */ #undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_SYS_TEXT_BASE 0x80400000 -#define CONFIG_SDRC /* The chip has SDRC controller */ - -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> /* * Display CPU and Board information
include/configs/omap3_mvblx.h +14 -9
@@ -32,18 +32,23 @@#define __CONFIG_H/* -* High Level Configuration Options +* Values that differ from platform defaults or are unspecified. */ -#define CONFIG_ARMV7 1/* This is an ARM V7 CPU core */ -#define CONFIG_OMAP 1/* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1/* which is a 34XX */ -#define CONFIG_MVBLX 1/* working with mvBlueLYNX-X */ -#define CONFIG_MACH_TYPE MACH_TYPE_MVBLX +#define CONFIG_SDRC /* The chip has SDRC controller */ -#define CONFIG_SDRC /* The chip has SDRC controller */ +/* Platform defaults */ +#include <configs/omap3_common.h> + +/* +* Override the common platform file choices. +*/ + +/* +* Other configuration options +*/ +#define CONFIG_MVBLX /* working with mvBlueLYNX-X */ +#define CONFIG_MACH_TYPE MACH_TYPE_MVBLX -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> /* * Display CPU and Board information
include/configs/omap3_overo.h +12 -7
@@ -20,16 +20,21 @@#define __CONFIG_H/* -* High Level Configuration Options +* Values that differ from platform defaults or are unspecified. */ -#define CONFIG_OMAP /* in a TI OMAP core */ -#define CONFIG_OMAP34XX /* which is a 34XX */ -#define CONFIG_OMAP3_OVERO /* working with overo */ +#define CONFIG_SDRC /* The chip has SDRC controller */ -#define CONFIG_SDRC /* The chip has SDRC controller */ +/* Platform defaults */ +#include <configs/omap3_common.h> -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +/* +* Override the common platform file choices. +*/ + +/* +* Other configuration options +*/ +#define CONFIG_OMAP3_OVERO /* working with overo */ /* * Display CPU and Board information
include/configs/omap3_pandora.h +12 -7
@@ -24,16 +24,21 @@#define __CONFIG_H/* -* High Level Configuration Options +* Values that differ from platform defaults or are unspecified. */ -#define CONFIG_OMAP 1/* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1/* which is a 34XX */ -#define CONFIG_OMAP3_PANDORA 1/* working with pandora */ +#define CONFIG_SDRC /* The chip has SDRC controller */ -#define CONFIG_SDRC /* The chip has SDRC controller */ +/* Platform defaults */ +#include <configs/omap3_common.h> -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +/* +* Override the common platform file choices. +*/ + +/* +* Other configuration options +*/ +#define CONFIG_OMAP3_PANDORA /* working with pandora */ /* * Display CPU and Board information
include/configs/omap3_sdp3430.h +20 -18
@@ -26,34 +26,36 @@* MA 02111-1307 USA */ +/* +* NOTE: We assume standard SDP jumper settings. +* In particular: +* - 26 MHz clock (not 19.2 or 38.4 MHz) +* - Boot from 128MB NOR, not NAND or OneNAND +* +* At this writing, OMAP3 U-Boot support doesn't permit concurrent +* support for all the flash types the board supports. +*/ +#ifndef __CONFIG_H#define __CONFIG_H -/* TODO: REMOVE THE FOLLOWING -* Retained the following till size.h is removed in u-boot -*/ -#include <asm/sizes.h> /* -* High Level Configuration Options +* Values that differ from platform defaults or are unspecified. */ -#define CONFIG_OMAP 1/* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1/* which is a 34XX */ -#define CONFIG_OMAP3_3430SDP 1/* working with SDP Rev2 */ +#define CONFIG_SDRC /* The chip has SDRC controller */ -#define CONFIG_SDRC /* The chip has SDRC controller */ +/* Platform defaults */ +#include <configs/omap3_common.h> -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +/* +* Override the common platform file choices. +*/ /* -* NOTE: these #defines presume standard SDP jumper settings. -* In particular: -* - 26 MHz clock (not 19.2 or 38.4 MHz) -* - Boot from 128MB NOR, not NAND or OneNAND -* -* At this writing, OMAP3 U-Boot support doesn't permit concurrent -* support for all the flash types the board supports. +* Other configuration options */ +#define CONFIG_OMAP3_3430SDP /* working with SDP Rev2 */ +#define CONFIG_DISPLAY_CPUINFO 1#define CONFIG_DISPLAY_BOARDINFO 1
include/configs/omap3_zoom1.h +12 -7
@@ -30,16 +30,21 @@#define __CONFIG_H/* -* High Level Configuration Options +* Values that differ from platform defaults or are unspecified. */ -#define CONFIG_OMAP 1/* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1/* which is a 34XX */ -#define CONFIG_OMAP3_ZOOM1 1/* working with Zoom MDK Rev1 */ +#define CONFIG_SDRC /* The chip has SDRC controller */ -#define CONFIG_SDRC /* The chip has SDRC controller */ +/* Platform defaults */ +#include <configs/omap3_common.h> -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +/* +* Override the common platform file choices. +*/ + +/* +* Other configuration options +*/ +#define CONFIG_OMAP3_ZOOM1 /* working with Zoom MDK Rev1 */ /* * Display CPU and Board information
include/configs/omap3_zoom2.h +12 -7
@@ -31,16 +31,21 @@#define __CONFIG_H/* -* High Level Configuration Options +* Values that differ from platform defaults or are unspecified. */ -#define CONFIG_OMAP 1/* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1/* which is a 34XX */ -#define CONFIG_OMAP3_ZOOM2 1/* working with Zoom II */ +#define CONFIG_SDRC /* The chip has SDRC controller */ -#define CONFIG_SDRC /* The chip has SDRC controller */ +/* Platform defaults */ +#include <configs/omap3_common.h> -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +/* +* Override the common platform file choices. +*/ + +/* +* Other configuration options +*/ +#define CONFIG_OMAP3_ZOOM2 /* working with Zoom II */ /* * Display CPU and Board information
include/configs/tam3517-common.h +13 -8
@@ -23,19 +23,24 @@#define __TAM3517_H/* -* High Level Configuration Options +* Values that differ from platform defaults or are unspecified. */ -#define CONFIG_OMAP /* in a TI OMAP core */ -#define CONFIG_OMAP34XX /* which is a 34XX */ +#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ -#define CONFIG_SYS_TEXT_BASE 0x80008000 +/* Platform defaults */ +#include <configs/omap3_common.h> -#define CONFIG_SYS_CACHELINE_SIZE 64 +/* +* Override the common platform file choices. +*/ -#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ +/* +* Other configuration options +*/ + +#define CONFIG_SYS_TEXT_BASE 0x80008000 -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#define CONFIG_SYS_CACHELINE_SIZE 64/* * Display CPU and Board information
include/configs/tricorder.h +15 -8
@@ -32,11 +32,23 @@#ifndef __CONFIG_H#define __CONFIG_H -/* High Level Configuration Options */ -#define CONFIG_OMAP /* in a TI OMAP core */ -#define CONFIG_OMAP34XX /* which is a 34XX */ +/* +* Values that differ from platform defaults or are unspecified. +*/ +#define CONFIG_SDRC /* The chip has SDRC controller */ + +/* Platform defaults */ +#include <configs/omap3_common.h> + +/* +* Override the common platform file choices. +*/ +/* +* Other configuration options +*/ #define CONFIG_MACH_TYPE MACH_TYPE_TRICORDER +/* * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM * 64 bytes before this address should be set aside for u-boot.img's
@@ -45,11 +57,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80100000 -#define CONFIG_SDRC /* The chip has SDRC controller */ - -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> -/* Display CPU and Board information */ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO
include/configs/twister.h +14 -0
@@ -24,8 +24,20 @@#ifndef __CONFIG_H#define __CONFIG_H +/* +* Values that differ from platform defaults or are unspecified. +*/ + +/* Platform defaults */ #include "tam3517-common.h" +/* +* Override the common platform file choices. +*/ + +/* +* Other configuration options +*/ #define MACH_TYPE_TAM3517 2818#define CONFIG_MACH_TYPE MACH_TYPE_TAM3517
@@ -51,4 +63,6 @@#define CONFIG_EXTRA_ENV_SETTINGS CONFIG_TAM3517_SETTINGS \ "bootcmd=run nandboot\0" +#include <configs/omap3_common.h> +#endif /* __CONFIG_H */
Signature · 1 line
1.7.0.4
RFC 1/11 omap3+: Introduce <configs/omap3_common.h>
I'm reading/replying to these one-by-one for sanity/clarity with regards to BeagleBoard...
-----Original Message-----
From: Tom Rini <[email protected]>
Date: Thu, 22 Mar 2012 12:09:07 -0700
To: <[email protected]>
Subject: [U-Boot] [RFC v0 01/11] omap3+: Introduce <configs/omap3_common.h>
Quoted 35 lines
This is a common file for OMAP3 (and OMAP3-alike) platforms to have default, configurable when needed values and choices placed. All users of this file now have a section for providing their overrides (when the defaults are not wanted), this file, and then a place to opt-out of choices this file has made.
Signed-off-by Tom Rini <[email protected]>---
include/configs/am3517_crane.h | 19 +++++++++----- include/configs/am3517_evm.h | 20 ++++++++++----- include/configs/cm_t35.h | 22 +++++++++++------ include/configs/devkit8000.h | 24 ++++++++++++------ include/configs/dig297.h | 22 +++++++++++------ include/configs/igep00x0.h | 19 ++++++++------ include/configs/mcx.h | 24 +++++++++++-------- include/configs/mt_ventoux.h | 13 ++++++++++ include/configs/omap3_beagle.h | 19 +++++++++----- include/configs/omap3_common.h | 40 ++++++++++++++++++++++++++++++++ include/configs/omap3_evm.h | 3 -- include/configs/omap3_evm_common.h | 15 ++++++++--- include/configs/omap3_evm_quick_mmc.h | 7 +++-- include/configs/omap3_evm_quick_nand.h | 7 +++-- include/configs/omap3_logic.h | 20 ++++++++++----- include/configs/omap3_mvblx.h | 23 +++++++++++------- include/configs/omap3_overo.h | 19 +++++++++----- include/configs/omap3_pandora.h | 19 +++++++++----- include/configs/omap3_sdp3430.h | 38 ++++++++++++++++-------------- include/configs/omap3_zoom1.h | 19 +++++++++----- include/configs/omap3_zoom2.h | 19 +++++++++----- include/configs/tam3517-common.h | 21 ++++++++++------ include/configs/tricorder.h | 23 ++++++++++++------ include/configs/twister.h | 14 +++++++++++ 24 files changed, 315 insertions(+), 154 deletions(-)
Quoted 3 lines
create mode 100644
include/configs/omap3_common.h
...remove non-beagle patches for brevity...
Quoted 10 lines
include/configs/omap3_beagle.h +0
-0@@ -29,16 +29,21 @@#define __CONFIG_H
include/configs/omap3_beagle.h line 38
Quoted 10 lines
include/configs/omap3_beagle.h +2
-5/* -* High Level Configuration Options +* Values that differ from platform defaults or are unspecified. */ -#define CONFIG_OMAP 1/* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1/* which is a 34XX */ -#define CONFIG_OMAP3_BEAGLE 1/* working with BEAGLE */ +#define CONFIG_SDRC /* The chip has SDRC controller */ -#define CONFIG_SDRC /* The chip has SDRC controller */
I can see it can make sense to have an OMAP/DM/AM3x target without SDRC enabled.
Quoted 53 lines
include/configs/omap3_beagle.h +10
-2+/* Platform defaults */ +#include <configs/omap3_common.h> -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +/* +* Override the common platform file choices. +*/ + +/* +* Other configuration options +*/ +#define CONFIG_OMAP3_BEAGLE /* working with BEAGLE */ /* * Display CPU and Board information include/configs/omap3_common.h new file +30
-0@@ -0,0 +1,40 @@ +/* +* (C) Copyright 2012 +* Texas Instruments Incorporated. +* Tom Rini <[email protected]> +* +* TI OMAP3 (and AM/DM related parts) common configuration settings +* +* See file CREDITS for list of people who contributed to this +* project. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* MA 02111-1307 USA +*/ + +#ifndef __CONFIG_OMAP3_COMMON_H +#define __CONFIG_OMAP3_COMMON_H + +/*
include/configs/omap3_common.h line 40
Quoted 10 lines
include/configs/omap3_common.h new file +10
-0+* A TI OMAP3 (or similar) core +*/ +#define CONFIG_OMAP +#define CONFIG_OMAP34XX + +/* Get CPU defs */ +#include <asm/arch/cpu.h> +#include <asm/arch/omap3.h> + +#endif /* __CONFIG_OMAP3_COMMON_H */
... non-beagle stuff removed for brevity ...
I think this change looks rather useful and would have no negative impact.
RFC 1/11 omap3+: Introduce <configs/omap3_common.h>
Quoted 2 lines · Jason Kridner
I'm reading/replying to these one-by-one for sanity/clarity with regards to BeagleBoard...
[snip]
Quoted 17 lines
Quoted 17 lines
include/configs/omap3_beagle.h +2
-4@@ -29,16 +29,21 @@#define __CONFIG_H/* -* High Level Configuration Options +* Values that differ from platform defaults or are unspecified. */ -#define CONFIG_OMAP 1/* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1/* which is a 34XX */ -#define CONFIG_OMAP3_BEAGLE 1/* working with BEAGLE */ +#define CONFIG_SDRC /* The chip has SDRC controller */
Quoted 4 lines
include/configs/omap3_beagle.h line 38
Quoted 1 line
include/configs/omap3_beagle.h +0
-1-#define CONFIG_SDRC /* The chip has SDRC controller */ I can see it can make sense to have an OMAP/DM/AM3x target without SDRC enabled.
Er, right. That's why SDRC or EMIF is done per-board for us (omap4/5 are EMIF only and if we can honestly keep am335x at one config for all boards it'll just be opting in to later parts of these kind of series).
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120323/9e5ba697/attachment.pgp>
RFC 2/11 omap3: Move DISPLAY_CPUINFO / DISPLAY_BOARDINFO to common
In reply to Tom RiniAll boards define (and get generic functions for) these, move to omap3_common.h
Signed-off-by Tom Rini <[email protected]>
--- include/configs/am3517_crane.h | 6 ------ include/configs/am3517_evm.h | 7 ------- include/configs/cm_t35.h | 7 ------- include/configs/devkit8000.h | 5 ----- include/configs/dig297.h | 6 ------ include/configs/igep00x0.h | 6 ------ include/configs/mcx.h | 6 ------ include/configs/omap3_beagle.h | 6 ------ include/configs/omap3_common.h | 4 ++++ include/configs/omap3_evm.h | 4 ---- include/configs/omap3_logic.h | 7 ------- include/configs/omap3_mvblx.h | 7 ------- include/configs/omap3_overo.h | 6 ------ include/configs/omap3_pandora.h | 6 ------ include/configs/omap3_sdp3430.h | 3 --- include/configs/omap3_zoom1.h | 6 ------ include/configs/omap3_zoom2.h | 6 ------ include/configs/tam3517-common.h | 6 ------ include/configs/tricorder.h | 4 ---- 19 files changed, 4 insertions(+), 104 deletions(-)
include/configs/am3517_crane.h +0 -6
@@ -42,12 +42,6 @@*/ #define CONFIG_OMAP3_AM3517CRANE /* working with CRANEBOARD */ -/* -* Display CPU and Board information -*/ -#define CONFIG_DISPLAY_CPUINFO 1 -#define CONFIG_DISPLAY_BOARDINFO 1 -/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
include/configs/am3517_evm.h +0 -7
@@ -42,13 +42,6 @@*/ #define CONFIG_OMAP3_AM3517EVM /* working with AM3517EVM */ - -/* -* Display CPU and Board information -*/ -#define CONFIG_DISPLAY_CPUINFO 1 -#define CONFIG_DISPLAY_BOARDINFO 1 -/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
include/configs/cm_t35.h +0 -7
@@ -51,13 +51,6 @@#define CONFIG_SYS_TEXT_BASE 0x80008000 - -/* -* Display CPU and Board information -*/ -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
include/configs/devkit8000.h +0 -5
@@ -56,11 +56,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80100000 - -/* Display CPU and Board information */ -#define CONFIG_DISPLAY_CPUINFO 1 -#define CONFIG_DISPLAY_BOARDINFO 1 -/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
include/configs/dig297.h +0 -6
@@ -59,12 +59,6 @@#define CONFIG_SYS_TEXT_BASE 0x80008000 -/* -* Display CPU and Board information -*/ -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
include/configs/igep00x0.h +0 -6
@@ -39,12 +39,6 @@* Other configuration options */ -/* -* Display CPU and Board information -*/ -#define CONFIG_DISPLAY_CPUINFO 1 -#define CONFIG_DISPLAY_BOARDINFO 1 -/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
include/configs/mcx.h +0 -6
@@ -51,12 +51,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80008000 -/* -* Display CPU and Board information -*/ -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
include/configs/omap3_beagle.h +0 -6
@@ -45,12 +45,6 @@*/ #define CONFIG_OMAP3_BEAGLE /* working with BEAGLE */ -/* -* Display CPU and Board information -*/ -#define CONFIG_DISPLAY_CPUINFO 1 -#define CONFIG_DISPLAY_BOARDINFO 1 -/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
include/configs/omap3_common.h +4 -0
@@ -37,4 +37,8 @@#include <asm/arch/cpu.h> #include <asm/arch/omap3.h> +/* Display CPU and Board Info */ +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DISPLAY_BOARDINFO +#endif /* __CONFIG_OMAP3_COMMON_H */
include/configs/omap3_evm.h +0 -4
@@ -61,10 +61,6 @@#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER -/* Display CPU and Board information */ -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -/* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE
include/configs/omap3_logic.h +0 -7
@@ -48,13 +48,6 @@#define CONFIG_SYS_TEXT_BASE 0x80400000 - -/* -* Display CPU and Board information -*/ -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
include/configs/omap3_mvblx.h +0 -7
@@ -49,13 +49,6 @@#define CONFIG_MVBLX /* working with mvBlueLYNX-X */ #define CONFIG_MACH_TYPE MACH_TYPE_MVBLX - -/* -* Display CPU and Board information -*/ -#define CONFIG_DISPLAY_CPUINFO 1 -#define CONFIG_DISPLAY_BOARDINFO 1 -/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
include/configs/omap3_overo.h +0 -6
@@ -36,12 +36,6 @@*/ #define CONFIG_OMAP3_OVERO /* working with overo */ -/* -* Display CPU and Board information -*/ -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
include/configs/omap3_pandora.h +0 -6
@@ -40,12 +40,6 @@*/ #define CONFIG_OMAP3_PANDORA /* working with pandora */ -/* -* Display CPU and Board information -*/ -#define CONFIG_DISPLAY_CPUINFO 1 -#define CONFIG_DISPLAY_BOARDINFO 1 -/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
include/configs/omap3_sdp3430.h +0 -3
@@ -56,9 +56,6 @@*/ #define CONFIG_OMAP3_3430SDP /* working with SDP Rev2 */ -#define CONFIG_DISPLAY_CPUINFO 1 -#define CONFIG_DISPLAY_BOARDINFO 1 -/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
include/configs/omap3_zoom1.h +0 -6
@@ -46,12 +46,6 @@*/ #define CONFIG_OMAP3_ZOOM1 /* working with Zoom MDK Rev1 */ -/* -* Display CPU and Board information -*/ -#define CONFIG_DISPLAY_CPUINFO 1 -#define CONFIG_DISPLAY_BOARDINFO 1 -/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
include/configs/omap3_zoom2.h +0 -6
@@ -47,12 +47,6 @@*/ #define CONFIG_OMAP3_ZOOM2 /* working with Zoom II */ -/* -* Display CPU and Board information -*/ -#define CONFIG_DISPLAY_CPUINFO 1 -#define CONFIG_DISPLAY_BOARDINFO 1 -/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
include/configs/tam3517-common.h +0 -6
@@ -42,12 +42,6 @@#define CONFIG_SYS_CACHELINE_SIZE 64 -/* -* Display CPU and Board information -*/ -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
include/configs/tricorder.h +0 -4
@@ -57,10 +57,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80100000 -/* Display CPU and Board information */ -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO -/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
Signature · 1 line
1.7.0.4
RFC 3/11 omap3: Move V_OSCK / V_SCLK to omap3_common.h
In reply to Tom RiniWe provide the common values for these clocks here and allow boards to provide their own values if needed.
Signed-off-by Tom Rini <[email protected]>
--- include/configs/am3517_crane.h | 4 ---- include/configs/am3517_evm.h | 4 ---- include/configs/cm_t35.h | 4 ---- include/configs/devkit8000.h | 4 ---- include/configs/dig297.h | 5 ----- include/configs/igep00x0.h | 4 ---- include/configs/mcx.h | 4 ---- include/configs/omap3_beagle.h | 4 ---- include/configs/omap3_common.h | 8 ++++++++ include/configs/omap3_evm_common.h | 6 ------ include/configs/omap3_logic.h | 4 ---- include/configs/omap3_mvblx.h | 4 ---- include/configs/omap3_overo.h | 4 ---- include/configs/omap3_pandora.h | 4 ---- include/configs/omap3_sdp3430.h | 4 ---- include/configs/omap3_zoom1.h | 4 ---- include/configs/omap3_zoom2.h | 4 ---- include/configs/tam3517-common.h | 4 ---- include/configs/tricorder.h | 4 ---- 19 files changed, 8 insertions(+), 75 deletions(-)
include/configs/am3517_crane.h +0 -4
@@ -42,10 +42,6 @@*/ #define CONFIG_OMAP3_AM3517CRANE /* working with CRANEBOARD */ -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R
include/configs/am3517_evm.h +0 -4
@@ -42,10 +42,6 @@*/ #define CONFIG_OMAP3_AM3517EVM /* working with AM3517EVM */ -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R
include/configs/cm_t35.h +0 -4
@@ -51,10 +51,6 @@#define CONFIG_SYS_TEXT_BASE 0x80008000 -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R
include/configs/devkit8000.h +0 -4
@@ -56,10 +56,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80100000 -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R
include/configs/dig297.h +0 -5
@@ -58,11 +58,6 @@#define CONFIG_SYS_TEXT_BASE 0x80008000 - -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R
include/configs/igep00x0.h +0 -4
@@ -39,10 +39,6 @@* Other configuration options */ -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) -#define CONFIG_MISC_INIT_R #define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */
include/configs/mcx.h +0 -4
@@ -51,10 +51,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80008000 -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) -#define CONFIG_MISC_INIT_R #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
include/configs/omap3_beagle.h +0 -4
@@ -45,10 +45,6 @@*/ #define CONFIG_OMAP3_BEAGLE /* working with BEAGLE */ -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R
include/configs/omap3_common.h +8 -0
@@ -41,4 +41,12 @@#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO +/* Clock Defines */ +#ifndef V_OSCK +#define V_OSCK 26000000/* Clock output from T2 */ +#endif +#ifndef V_SCLK +#define V_SCLK (V_OSCK >> 1) +#endif +#endif /* __CONFIG_OMAP3_COMMON_H */
include/configs/omap3_evm_common.h +0 -6
@@ -38,12 +38,6 @@#undef CONFIG_USE_IRQ/* no support for IRQs */ /* -* Clock related definitions -*/ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) - -/* * OMAP3 has 12 GP timers, they can be driven by the system clock * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK). * This rate is divided by a local divisor.
include/configs/omap3_logic.h +0 -4
@@ -48,10 +48,6 @@#define CONFIG_SYS_TEXT_BASE 0x80400000 -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) -#define CONFIG_MISC_INIT_R /* misc_init_r dumps the die id */ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
include/configs/omap3_mvblx.h +0 -4
@@ -49,10 +49,6 @@#define CONFIG_MVBLX /* working with mvBlueLYNX-X */ #define CONFIG_MACH_TYPE MACH_TYPE_MVBLX -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R
include/configs/omap3_overo.h +0 -4
@@ -36,10 +36,6 @@*/ #define CONFIG_OMAP3_OVERO /* working with overo */ -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R
include/configs/omap3_pandora.h +0 -4
@@ -40,10 +40,6 @@*/ #define CONFIG_OMAP3_PANDORA /* working with pandora */ -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R
include/configs/omap3_sdp3430.h +0 -4
@@ -56,10 +56,6 @@*/ #define CONFIG_OMAP3_3430SDP /* working with SDP Rev2 */ -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R
include/configs/omap3_zoom1.h +0 -4
@@ -46,10 +46,6 @@*/ #define CONFIG_OMAP3_ZOOM1 /* working with Zoom MDK Rev1 */ -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R
include/configs/omap3_zoom2.h +0 -4
@@ -47,10 +47,6 @@*/ #define CONFIG_OMAP3_ZOOM2 /* working with Zoom II */ -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R
include/configs/tam3517-common.h +0 -4
@@ -42,10 +42,6 @@#define CONFIG_SYS_CACHELINE_SIZE 64 -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R
include/configs/tricorder.h +0 -4
@@ -57,10 +57,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80100000 -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R
Signature · 1 line
1.7.0.4
RFC 4/11 omap3: Move '#undef CONFIG_USE_IRQ' to omap3_common.h
In reply to Tom RiniMove this common un-setting over to omap3_common.h
Signed-off-by Tom Rini <[email protected]>
--- include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/cm_t35.h | 1 - include/configs/devkit8000.h | 1 - include/configs/dig297.h | 5 ----- include/configs/omap3_beagle.h | 1 - include/configs/omap3_common.h | 3 +++ include/configs/omap3_evm_common.h | 2 -- include/configs/omap3_logic.h | 2 -- include/configs/omap3_mvblx.h | 1 - include/configs/omap3_overo.h | 1 - include/configs/omap3_pandora.h | 1 - include/configs/omap3_sdp3430.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/omap3_zoom2.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/tricorder.h | 1 - 17 files changed, 3 insertions(+), 22 deletions(-)
include/configs/am3517_crane.h +0 -1
@@ -42,7 +42,6 @@*/ #define CONFIG_OMAP3_AM3517CRANE /* working with CRANEBOARD */ -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R #define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */
include/configs/am3517_evm.h +0 -1
@@ -42,7 +42,6 @@*/ #define CONFIG_OMAP3_AM3517EVM /* working with AM3517EVM */ -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R #define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */
include/configs/cm_t35.h +0 -1
@@ -51,7 +51,6 @@#define CONFIG_SYS_TEXT_BASE 0x80008000 -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R #define CONFIG_OF_LIBFDT 1
include/configs/devkit8000.h +0 -1
@@ -56,7 +56,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80100000 -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R #define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */
include/configs/dig297.h +0 -5
@@ -58,7 +58,6 @@#define CONFIG_SYS_TEXT_BASE 0x80008000 -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
@@ -260,10 +259,6 @@* The stack sizes are set up in start.S using the settings below */ #define CONFIG_STACKSIZE (128 << 10)/* regular stack 128 KiB */ -#ifdef CONFIG_USE_IRQ -#define CONFIG_STACKSIZE_IRQ (4 << 10)/* IRQ stack 4 KiB */ -#define CONFIG_STACKSIZE_FIQ (4 << 10)/* FIQ stack 4 KiB */ -#endif /*----------------------------------------------------------------------- * Physical Memory Map
include/configs/omap3_beagle.h +0 -1
@@ -45,7 +45,6 @@*/ #define CONFIG_OMAP3_BEAGLE /* working with BEAGLE */ -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R #define CONFIG_OF_LIBFDT 1
include/configs/omap3_common.h +3 -0
@@ -49,4 +49,7 @@#define V_SCLK (V_OSCK >> 1)#endif +/* no support for IRQs */ +#undef CONFIG_USE_IRQ +#endif /* __CONFIG_OMAP3_COMMON_H */
include/configs/omap3_evm_common.h +0 -2
@@ -35,8 +35,6 @@#define CONFIG_OMAP3_EVM /* This is a OMAP3 EVM */ #define CONFIG_TWL4030_POWER /* with TWL4030 PMIC */ -#undef CONFIG_USE_IRQ/* no support for IRQs */ -/* * OMAP3 has 12 GP timers, they can be driven by the system clock * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK).
include/configs/omap3_logic.h +0 -2
@@ -44,8 +44,6 @@*/ #define CONFIG_OMAP3_LOGIC /* working with Logic OMAP boards */ -#undef CONFIG_USE_IRQ/* no support for IRQs */ -#define CONFIG_SYS_TEXT_BASE 0x80400000#define CONFIG_MISC_INIT_R /* misc_init_r dumps the die id */
include/configs/omap3_mvblx.h +0 -1
@@ -49,7 +49,6 @@#define CONFIG_MVBLX /* working with mvBlueLYNX-X */ #define CONFIG_MACH_TYPE MACH_TYPE_MVBLX -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R #define CONFIG_OF_LIBFDT 1
include/configs/omap3_overo.h +0 -1
@@ -36,7 +36,6 @@*/ #define CONFIG_OMAP3_OVERO /* working with overo */ -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
include/configs/omap3_pandora.h +0 -1
@@ -40,7 +40,6 @@*/ #define CONFIG_OMAP3_PANDORA /* working with pandora */ -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R #define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */
include/configs/omap3_sdp3430.h +0 -1
@@ -56,7 +56,6 @@*/ #define CONFIG_OMAP3_3430SDP /* working with SDP Rev2 */ -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R #define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */
include/configs/omap3_zoom1.h +0 -1
@@ -46,7 +46,6 @@*/ #define CONFIG_OMAP3_ZOOM1 /* working with Zoom MDK Rev1 */ -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R #define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */
include/configs/omap3_zoom2.h +0 -1
@@ -47,7 +47,6 @@*/ #define CONFIG_OMAP3_ZOOM2 /* working with Zoom II */ -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R #define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */
include/configs/tam3517-common.h +0 -1
@@ -42,7 +42,6 @@#define CONFIG_SYS_CACHELINE_SIZE 64 -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
include/configs/tricorder.h +0 -1
@@ -57,7 +57,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80100000 -#undef CONFIG_USE_IRQ/* no support for IRQs */ #define CONFIG_MISC_INIT_R #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
Signature · 1 line
1.7.0.4
RFC 5/11 omap3: Move CONFIG_MISC_INIT_R to omap3_common.h
In reply to Tom RiniAll platforms have at least a minimal function to print the dieid
Signed-off-by Tom Rini <[email protected]>
--- include/configs/am3517_crane.h | 2 -- include/configs/am3517_evm.h | 2 -- include/configs/cm_t35.h | 2 -- include/configs/devkit8000.h | 2 -- include/configs/dig297.h | 2 -- include/configs/igep00x0.h | 2 -- include/configs/mcx.h | 2 -- include/configs/omap3_beagle.h | 2 -- include/configs/omap3_common.h | 3 +++ include/configs/omap3_evm_common.h | 2 -- include/configs/omap3_logic.h | 2 -- include/configs/omap3_mvblx.h | 2 -- include/configs/omap3_overo.h | 2 -- include/configs/omap3_pandora.h | 2 -- include/configs/omap3_sdp3430.h | 2 -- include/configs/omap3_zoom1.h | 2 -- include/configs/omap3_zoom2.h | 2 -- include/configs/tam3517-common.h | 2 -- include/configs/tricorder.h | 2 -- 19 files changed, 3 insertions(+), 36 deletions(-)
include/configs/am3517_crane.h +0 -2
@@ -42,8 +42,6 @@*/ #define CONFIG_OMAP3_AM3517CRANE /* working with CRANEBOARD */ -#define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS 1#define CONFIG_INITRD_TAG 1
include/configs/am3517_evm.h +0 -2
@@ -42,8 +42,6 @@*/ #define CONFIG_OMAP3_AM3517EVM /* working with AM3517EVM */ -#define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS 1#define CONFIG_INITRD_TAG 1
include/configs/cm_t35.h +0 -2
@@ -51,8 +51,6 @@#define CONFIG_SYS_TEXT_BASE 0x80008000 -#define CONFIG_MISC_INIT_R -#define CONFIG_OF_LIBFDT 1/* * The early kernel mapping on ARM currently only maps from the base of DRAM
include/configs/devkit8000.h +0 -2
@@ -56,8 +56,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80100000 -#define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS 1#define CONFIG_INITRD_TAG 1
include/configs/dig297.h +0 -2
@@ -58,8 +58,6 @@#define CONFIG_SYS_TEXT_BASE 0x80008000 -#define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG
include/configs/igep00x0.h +0 -2
@@ -39,8 +39,6 @@* Other configuration options */ -#define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS 1#define CONFIG_INITRD_TAG 1
include/configs/mcx.h +0 -2
@@ -51,8 +51,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80008000 -#define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG
include/configs/omap3_beagle.h +0 -2
@@ -45,8 +45,6 @@*/ #define CONFIG_OMAP3_BEAGLE /* working with BEAGLE */ -#define CONFIG_MISC_INIT_R -#define CONFIG_OF_LIBFDT 1#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */
include/configs/omap3_common.h +3 -0
@@ -52,4 +52,7 @@/* no support for IRQs */ #undef CONFIG_USE_IRQ +/* Portions of the init sequence that we want */ +#define CONFIG_MISC_INIT_R +#endif /* __CONFIG_OMAP3_COMMON_H */
include/configs/omap3_evm_common.h +0 -2
@@ -200,8 +200,6 @@#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "#define CONFIG_SYS_MAXARGS 16/* max args for a command */ -#define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG
include/configs/omap3_logic.h +0 -2
@@ -46,8 +46,6 @@#define CONFIG_SYS_TEXT_BASE 0x80400000 -#define CONFIG_MISC_INIT_R /* misc_init_r dumps the die id */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG
include/configs/omap3_mvblx.h +0 -2
@@ -49,8 +49,6 @@#define CONFIG_MVBLX /* working with mvBlueLYNX-X */ #define CONFIG_MACH_TYPE MACH_TYPE_MVBLX -#define CONFIG_MISC_INIT_R -#define CONFIG_OF_LIBFDT 1#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */
include/configs/omap3_overo.h +0 -2
@@ -36,8 +36,6 @@*/ #define CONFIG_OMAP3_OVERO /* working with overo */ -#define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG
include/configs/omap3_pandora.h +0 -2
@@ -40,8 +40,6 @@*/ #define CONFIG_OMAP3_PANDORA /* working with pandora */ -#define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS 1#define CONFIG_INITRD_TAG 1
include/configs/omap3_sdp3430.h +0 -2
@@ -56,8 +56,6 @@*/ #define CONFIG_OMAP3_3430SDP /* working with SDP Rev2 */ -#define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS 1#define CONFIG_INITRD_TAG 1
include/configs/omap3_zoom1.h +0 -2
@@ -46,8 +46,6 @@*/ #define CONFIG_OMAP3_ZOOM1 /* working with Zoom MDK Rev1 */ -#define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS 1#define CONFIG_INITRD_TAG 1
include/configs/omap3_zoom2.h +0 -2
@@ -47,8 +47,6 @@*/ #define CONFIG_OMAP3_ZOOM2 /* working with Zoom II */ -#define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS 1#define CONFIG_INITRD_TAG 1
include/configs/tam3517-common.h +0 -2
@@ -42,8 +42,6 @@#define CONFIG_SYS_CACHELINE_SIZE 64 -#define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG
include/configs/tricorder.h +0 -2
@@ -57,8 +57,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80100000 -#define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG
Signature · 1 line
1.7.0.4
RFC 6/11 omap3: Move ATAGS and OF_LIBFDT to omap3_common.h
In reply to Tom RiniConsolidate all of the ATAGS defines into a single location and enable OF_LIBFDT support as well. Only omap3_mvblx and cm_t35 also pass the SERIAL ATAG.
Signed-off-by Tom Rini <[email protected]>
--- include/configs/am3517_crane.h | 5 ----- include/configs/am3517_evm.h | 5 ----- include/configs/cm_t35.h | 8 +------- include/configs/devkit8000.h | 7 ------- include/configs/dig297.h | 5 ----- include/configs/igep00x0.h | 7 ------- include/configs/mcx.h | 6 ------ include/configs/omap3_beagle.h | 7 ------- include/configs/omap3_common.h | 7 +++++++ include/configs/omap3_evm_common.h | 5 ----- include/configs/omap3_logic.h | 5 ----- include/configs/omap3_mvblx.h | 9 +-------- include/configs/omap3_overo.h | 7 ------- include/configs/omap3_pandora.h | 7 ------- include/configs/omap3_sdp3430.h | 7 ------- include/configs/omap3_zoom1.h | 7 ------- include/configs/omap3_zoom2.h | 7 ------- include/configs/tam3517-common.h | 6 ------ include/configs/tricorder.h | 7 ------- 19 files changed, 9 insertions(+), 115 deletions(-)
include/configs/am3517_crane.h +0 -5
@@ -42,11 +42,6 @@*/ #define CONFIG_OMAP3_AM3517CRANE /* working with CRANEBOARD */ -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 -#define CONFIG_REVISION_TAG 1 -/* * Size of malloc() pool */
include/configs/am3517_evm.h +0 -5
@@ -42,11 +42,6 @@*/ #define CONFIG_OMAP3_AM3517EVM /* working with AM3517EVM */ -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 -#define CONFIG_REVISION_TAG 1 -/* * Size of malloc() pool */
include/configs/cm_t35.h +1 -7
@@ -36,6 +36,7 @@* Values that differ from platform defaults or are unspecified. */ #define CONFIG_SDRC /* The chip has SDRC controller */ +#define CONFIG_SERIAL_TAG /* Add SERIAL ATAG */ /* Platform defaults */ #include <configs/omap3_common.h>
@@ -51,7 +52,6 @@#define CONFIG_SYS_TEXT_BASE 0x80008000 -#define CONFIG_OF_LIBFDT 1/* * The early kernel mapping on ARM currently only maps from the base of DRAM * to the end of the kernel image. The kernel is loaded at DRAM base + 0x8000.
@@ -60,12 +60,6 @@*/ #define CONFIG_SYS_BOOTMAPSZ 0x4000 -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SERIAL_TAG -/* * Size of malloc() pool */
include/configs/devkit8000.h +0 -7
@@ -56,13 +56,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80100000 -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 -#define CONFIG_REVISION_TAG 1 - -#define CONFIG_OF_LIBFDT 1 -/* Size of malloc() pool */ #define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ /* Sector */
include/configs/dig297.h +0 -5
@@ -58,11 +58,6 @@#define CONFIG_SYS_TEXT_BASE 0x80008000 -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -/* * Size of malloc() pool */
include/configs/igep00x0.h +0 -7
@@ -39,13 +39,6 @@* Other configuration options */ -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 -#define CONFIG_REVISION_TAG 1 - -#define CONFIG_OF_LIBFDT 1 -/* * NS16550 Configuration */
include/configs/mcx.h +0 -6
@@ -42,7 +42,6 @@#define CONFIG_SYS_CACHELINE_SIZE 64 -#define CONFIG_OF_LIBFDT #define CONFIG_FIT /*
@@ -51,11 +50,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80008000 -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -/* * Size of malloc() pool */
include/configs/omap3_beagle.h +0 -7
@@ -45,13 +45,6 @@*/ #define CONFIG_OMAP3_BEAGLE /* working with BEAGLE */ -#define CONFIG_OF_LIBFDT 1 - -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 -#define CONFIG_REVISION_TAG 1 -/* * Size of malloc() pool */
include/configs/omap3_common.h +7 -0
@@ -55,4 +55,11 @@/* Portions of the init sequence that we want */ #define CONFIG_MISC_INIT_R +/* Enable support for both device trees and ATAGS */ +#define CONFIG_OF_LIBFDT +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG +#define CONFIG_REVISION_TAG +#endif /* __CONFIG_OMAP3_COMMON_H */
include/configs/omap3_evm_common.h +0 -5
@@ -200,11 +200,6 @@#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "#define CONFIG_SYS_MAXARGS 16/* max args for a command */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -/* Size of Console IO buffer */ #define CONFIG_SYS_CBSIZE 512
include/configs/omap3_logic.h +0 -5
@@ -46,11 +46,6 @@#define CONFIG_SYS_TEXT_BASE 0x80400000 -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_CMDLINE_EDITING /* cmd line edit/history */ #define CONFIG_ZERO_BOOTDELAY_CHECK /* check keypress w/no delay */
include/configs/omap3_mvblx.h +1 -8
@@ -35,6 +35,7 @@* Values that differ from platform defaults or are unspecified. */ #define CONFIG_SDRC /* The chip has SDRC controller */ +#define CONFIG_SERIAL_TAG /* Add SERIAL ATAG */ /* Platform defaults */ #include <configs/omap3_common.h>
@@ -49,14 +50,6 @@#define CONFIG_MVBLX /* working with mvBlueLYNX-X */ #define CONFIG_MACH_TYPE MACH_TYPE_MVBLX -#define CONFIG_OF_LIBFDT 1 - -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 -#define CONFIG_REVISION_TAG 1 -#define CONFIG_SERIAL_TAG 1 -/* * Size of malloc() pool */
include/configs/omap3_overo.h +0 -7
@@ -36,13 +36,6 @@*/ #define CONFIG_OMAP3_OVERO /* working with overo */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - -#define CONFIG_OF_LIBFDT -/* * Size of malloc() pool */
include/configs/omap3_pandora.h +0 -7
@@ -40,13 +40,6 @@*/ #define CONFIG_OMAP3_PANDORA /* working with pandora */ -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 -#define CONFIG_REVISION_TAG 1 - -#define CONFIG_OF_LIBFDT 1 -/* * Size of malloc() pool */
include/configs/omap3_sdp3430.h +0 -7
@@ -56,13 +56,6 @@*/ #define CONFIG_OMAP3_3430SDP /* working with SDP Rev2 */ -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 -#define CONFIG_REVISION_TAG 1 - -#define CONFIG_OF_LIBFDT 1 -/* * Size of malloc() pool * Total Size Environment - 256k
include/configs/omap3_zoom1.h +0 -7
@@ -46,13 +46,6 @@*/ #define CONFIG_OMAP3_ZOOM1 /* working with Zoom MDK Rev1 */ -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 -#define CONFIG_REVISION_TAG 1 - -#define CONFIG_OF_LIBFDT 1 -/* * Size of malloc() pool */
include/configs/omap3_zoom2.h +0 -7
@@ -47,13 +47,6 @@*/ #define CONFIG_OMAP3_ZOOM2 /* working with Zoom II */ -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 -#define CONFIG_REVISION_TAG 1 - -#define CONFIG_OF_LIBFDT 1 -/* * Size of malloc() pool */
include/configs/tam3517-common.h +0 -6
@@ -42,11 +42,6 @@#define CONFIG_SYS_CACHELINE_SIZE 64 -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -/* * Size of malloc() pool */
@@ -275,7 +270,6 @@#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000#define CONFIG_SYS_NAND_U_BOOT_SIZE 0x80000 -#define CONFIG_OF_LIBFDT #define CONFIG_FIT #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS
include/configs/tricorder.h +0 -7
@@ -57,13 +57,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80100000 -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - -#define CONFIG_OF_LIBFDT -/* Size of malloc() pool */ #define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ /* Sector */
Signature · 1 line
1.7.0.4
RFC 7/11 omap3: Move SYS_MALLOC_LEN and ENV_SIZE to omap3_common.h
In reply to Tom RiniWe provide a default CONFIG_SYS_MALLOC_LEN of 1mb (noting that saveenv and UBI are both large users by default) and a default of 128KB for environment. Both of these can be overriden by the board if needed.
Signed-off-by Tom Rini <[email protected]>
--- include/configs/am3517_crane.h | 6 ------ include/configs/am3517_evm.h | 5 ----- include/configs/cm_t35.h | 7 ------- include/configs/devkit8000.h | 5 ----- include/configs/dig297.h | 7 ------- include/configs/igep00x0.h | 5 ----- include/configs/mcx.h | 5 ----- include/configs/omap3_beagle.h | 7 ------- include/configs/omap3_common.h | 14 ++++++++++++++ include/configs/omap3_evm_common.h | 6 ------ include/configs/omap3_logic.h | 7 ------- include/configs/omap3_mvblx.h | 8 ++------ include/configs/omap3_overo.h | 7 ------- include/configs/omap3_pandora.h | 6 ------ include/configs/omap3_sdp3430.h | 9 +-------- include/configs/omap3_zoom1.h | 7 ------- include/configs/omap3_zoom2.h | 6 ------ include/configs/tam3517-common.h | 6 ------ include/configs/tricorder.h | 5 ----- 19 files changed, 17 insertions(+), 111 deletions(-)
include/configs/am3517_crane.h +0 -6
@@ -43,12 +43,6 @@#define CONFIG_OMAP3_AM3517CRANE /* working with CRANEBOARD */ /* -* Size of malloc() pool -*/ -#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB sector */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10)) -/* initial data */ -/* * DDR related */ #define CONFIG_SYS_CS0_SIZE (256 * 1024 * 1024)
include/configs/am3517_evm.h +0 -5
@@ -43,11 +43,6 @@#define CONFIG_OMAP3_AM3517EVM /* working with AM3517EVM */ /* -* Size of malloc() pool -*/ -#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB sector */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10)) -/* * DDR related */ #define CONFIG_SYS_CS0_SIZE (256 * 1024 * 1024)
include/configs/cm_t35.h +0 -7
@@ -61,13 +61,6 @@#define CONFIG_SYS_BOOTMAPSZ 0x4000/* -* Size of malloc() pool -*/ -#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ -/* Sector */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10)) - -/* * Hardware drivers */
include/configs/devkit8000.h +0 -5
@@ -56,11 +56,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80100000 -/* Size of malloc() pool */ -#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ -/* Sector */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10)) -/* Hardware drivers */ /* DM9000 */ #define CONFIG_NET_RETRY_COUNT 20
include/configs/dig297.h +0 -7
@@ -59,13 +59,6 @@#define CONFIG_SYS_TEXT_BASE 0x80008000/* -* Size of malloc() pool -*/ -#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ -/* Sector */ -#define CONFIG_SYS_MALLOC_LEN (1024 << 10)/* UBI needs >= 512 kB */ - -/* * Hardware drivers */
include/configs/igep00x0.h +0 -5
@@ -236,11 +236,6 @@#define CONFIG_ENV_ADDR ONENAND_ENV_OFFSET/* -* Size of malloc() pool -*/ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10)) - -/* * SMSC911x Ethernet */ #if defined(CONFIG_CMD_NET )
include/configs/mcx.h +0 -5
@@ -51,11 +51,6 @@#define CONFIG_SYS_TEXT_BASE 0x80008000/* -* Size of malloc() pool -*/ -#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB sector */ -#define CONFIG_SYS_MALLOC_LEN (1024 << 10) -/* * DDR related */ #define CONFIG_SYS_CS0_SIZE (256 * 1024 * 1024)
include/configs/omap3_beagle.h +0 -7
@@ -46,13 +46,6 @@#define CONFIG_OMAP3_BEAGLE /* working with BEAGLE */ /* -* Size of malloc() pool -*/ -#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ -/* Sector */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10)) - -/* * Hardware drivers */
include/configs/omap3_common.h +14 -0
@@ -62,4 +62,18 @@#define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG +/* +* A minimum size of malloc() pool. There are two common large users here. +* One of which is 'saveenv' which requires a pool of the size of the +* environment (CONFIG_ENV_SIZE). A second user is UBI which requires +*@least 512KiB. We default to 1MB worth of pool. These can be +* overridden by the board if needed. +*/ +#ifndef CONFIG_ENV_SIZE +#define CONFIG_ENV_SIZE (128 << 10) +#endif +#ifndef CONFIG_SYS_MALLOC_LEN +#define CONFIG_SYS_MALLOC_LEN (1024 << 10) +#endif +#endif /* __CONFIG_OMAP3_COMMON_H */
include/configs/omap3_evm_common.h +0 -6
@@ -44,12 +44,6 @@#define CONFIG_SYS_PTV 2/* Divisor: 2^(PTV+1) => 8 */ #define CONFIG_SYS_HZ 1000 -/* Size of environment - 128KB */ -#define CONFIG_ENV_SIZE (128 << 10) - -/* Size of malloc pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10)) -/* * Stack sizes * These values are used in start.S
include/configs/omap3_logic.h +0 -7
@@ -50,13 +50,6 @@#define CONFIG_ZERO_BOOTDELAY_CHECK /* check keypress w/no delay */ /* -* Size of malloc() pool -*/ -#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ -/* Sector */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10)) - -/* * Hardware drivers */
include/configs/omap3_mvblx.h +2 -6
@@ -50,12 +50,8 @@#define CONFIG_MVBLX /* working with mvBlueLYNX-X */ #define CONFIG_MACH_TYPE MACH_TYPE_MVBLX -/* -* Size of malloc() pool -*/ -#define CONFIG_ENV_SIZE (2 << 10)/* 2 KiB */ -/* Sector */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10)) +/* We have a 2KiB sector size */ +#define CONFIG_ENV_SIZE (2 << 10)/* * Hardware drivers
include/configs/omap3_overo.h +0 -7
@@ -37,13 +37,6 @@#define CONFIG_OMAP3_OVERO /* working with overo */ /* -* Size of malloc() pool -*/ -#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ -/* Sector */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10)) - -/* * Hardware drivers */
include/configs/omap3_pandora.h +0 -6
@@ -41,12 +41,6 @@#define CONFIG_OMAP3_PANDORA /* working with pandora */ /* -* Size of malloc() pool -*/ -#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ -#define CONFIG_SYS_MALLOC_LEN (1024 * 1024 + CONFIG_ENV_SIZE) - -/* * Hardware drivers */
include/configs/omap3_sdp3430.h +1 -8
@@ -56,15 +56,8 @@*/ #define CONFIG_OMAP3_3430SDP /* working with SDP Rev2 */ -/* -* Size of malloc() pool -* Total Size Environment - 256k -* Malloc - add 256k -*/ +/* We have 256KiB for environment. */ #define CONFIG_ENV_SIZE (256 << 10) -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (256 << 10)) - -/*--------------------------------------------------------------------------*/ /* * Hardware drivers
include/configs/omap3_zoom1.h +0 -7
@@ -47,13 +47,6 @@#define CONFIG_OMAP3_ZOOM1 /* working with Zoom MDK Rev1 */ /* -* Size of malloc() pool -*/ -#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ -/* Sector */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10)) - -/* * Hardware drivers */
include/configs/omap3_zoom2.h +0 -6
@@ -48,12 +48,6 @@#define CONFIG_OMAP3_ZOOM2 /* working with Zoom II */ /* -* Size of malloc() pool -*/ -#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ -/* Sector */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10)) -/* * Hardware drivers */
include/configs/tam3517-common.h +0 -6
@@ -43,12 +43,6 @@#define CONFIG_SYS_CACHELINE_SIZE 64/* -* Size of malloc() pool -*/ -#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB sector */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10) + \ - 2 * 1024 * 1024) -/* * DDR related */ #define CONFIG_OMAP3_MICRON_DDR /* Micron DDR */
include/configs/tricorder.h +0 -5
@@ -57,11 +57,6 @@*/ #define CONFIG_SYS_TEXT_BASE 0x80100000 -/* Size of malloc() pool */ -#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ -/* Sector */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (512 << 10)) -/* Hardware drivers */ /* NS16550 Configuration */
Signature · 1 line
1.7.0.4
RFC 8/11 omap3: Consolidate UART information in omap3_common.h
In reply to Tom RiniUnless a board defines CONFIG_SERIAL_MULTI we assume it is using an on-module UART somewhere. We leave the exact configuration per-board.
Start an environment section in omap3_common.h and default to allowing the environment to override console/ethaddr. omap3_mvblx retains its behavior via opt-out.
We also remove CONFIG_SERIAL[123] as these aren't meaningful for the ns16550 driver.
Signed-off-by Tom Rini <[email protected]>
--- include/configs/am3517_crane.h | 21 ++------------------- include/configs/am3517_evm.h | 20 +------------------- include/configs/cm_t35.h | 20 +------------------- include/configs/devkit8000.h | 13 +------------ include/configs/dig297.h | 21 ++------------------- include/configs/igep00x0.h | 20 ++------------------ include/configs/mcx.h | 20 +------------------- include/configs/omap3_beagle.h | 21 ++------------------- include/configs/omap3_common.h | 18 ++++++++++++++++++ include/configs/omap3_evm.h | 3 --- include/configs/omap3_evm_common.h | 17 +---------------- include/configs/omap3_logic.h | 21 ++------------------- include/configs/omap3_mvblx.h | 23 +++++------------------ include/configs/omap3_overo.h | 21 ++------------------- include/configs/omap3_pandora.h | 21 ++------------------- include/configs/omap3_sdp3430.h | 21 ++------------------- include/configs/omap3_zoom1.h | 21 ++------------------- include/configs/omap3_zoom2.h | 13 +++---------- include/configs/tam3517-common.h | 18 +----------------- include/configs/tricorder.h | 13 +------------ 20 files changed, 51 insertions(+), 315 deletions(-)
include/configs/am3517_crane.h +2 -19
@@ -51,28 +51,11 @@* Hardware drivers */ -/* -* NS16550 Configuration -*/ -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* -* select serial console configuration -*/ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3/* UART3 on CRANEBOARD */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} +#define CONFIG_GENERIC_MMC 1#define CONFIG_MMC 1#define CONFIG_OMAP_HSMMC 1
include/configs/am3517_evm.h +1 -19
@@ -51,28 +51,10 @@* Hardware drivers */ -/* -* NS16550 Configuration -*/ -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* -* select serial console configuration -*/ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3/* UART3 on AM3517 EVM */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200}#define CONFIG_MMC 1#define CONFIG_GENERIC_MMC 1#define CONFIG_OMAP_HSMMC 1
include/configs/cm_t35.h +1 -19
@@ -64,28 +64,10 @@* Hardware drivers */ -/* -* NS16550 Configuration -*/ -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* -* select serial console configuration -*/ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3/* UART3 */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200}#define CONFIG_GENERIC_MMC #define CONFIG_MMC
include/configs/devkit8000.h +1 -12
@@ -67,19 +67,10 @@#define CONFIG_DM9000_NO_SROM 1#undef CONFIG_DM9000_DEBUG -/* NS16550 Configuration */ -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ - -/* select serial console configuration */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3#define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200}/* MMC */ #define CONFIG_GENERIC_MMC 1
@@ -159,8 +150,6 @@#undef CONFIG_BOOTP_VENDOREX/* Environment information */ -#define CONFIG_ENV_OVERWRITE /* allow to overwrite serial and ethaddr */ -#define CONFIG_BOOTDELAY 3#define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/dig297.h +2 -19
@@ -62,28 +62,11 @@* Hardware drivers */ -/* -* NS16550 Configuration -*/ -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* -* select serial console configuration: UART3 (ttyO2) -*/ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} +#define CONFIG_GENERIC_MMC 1#define CONFIG_MMC 1#define CONFIG_OMAP_HSMMC 1
include/configs/igep00x0.h +2 -18
@@ -39,27 +39,11 @@* Other configuration options */ -/* -* NS16550 Configuration -*/ - -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* select serial console configuration */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \ - 115200} +#define CONFIG_GENERIC_MMC 1#define CONFIG_MMC 1#define CONFIG_OMAP_HSMMC 1
include/configs/mcx.h +1 -19
@@ -59,28 +59,10 @@* Hardware drivers */ -/* -* NS16550 Configuration -*/ -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* -* select serial console configuration -*/ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3/* UART3 */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200}#define CONFIG_MMC #define CONFIG_OMAP_HSMMC #define CONFIG_GENERIC_MMC
include/configs/omap3_beagle.h +2 -19
@@ -49,28 +49,11 @@* Hardware drivers */ -/* -* NS16550 Configuration -*/ -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* -* select serial console configuration -*/ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3/* UART3 on Beagle Rev 2 */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} +#define CONFIG_GENERIC_MMC 1#define CONFIG_MMC 1#define CONFIG_OMAP_HSMMC 1
include/configs/omap3_common.h +18 -0
@@ -76,4 +76,22 @@#define CONFIG_SYS_MALLOC_LEN (1024 << 10)#endif +/* +* Default serial port configuration is an NS16550-compatible UART. +* Boards can override this as needed with CONFIG_SERIAL_MULTI +*/ +#ifndef CONFIG_SERIAL_MULTI +#define CONFIG_SYS_NS16550 +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE (-4) +#define CONFIG_SYS_NS16550_CLK 48000000 +#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ + 115200} +#endif + +/* +* Environmnet +*/ +#define CONFIG_ENV_OVERWRITE /* Allow to overwrite serial and ethaddr */ +#endif /* __CONFIG_OMAP3_COMMON_H */
include/configs/omap3_evm.h +0 -3
@@ -61,9 +61,6 @@#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -/* Add auto-completion support */ #define CONFIG_AUTO_COMPLETE
include/configs/omap3_evm_common.h +1 -16
@@ -72,25 +72,10 @@* ----------------------------------------------------------------------------- */ -/* -* NS16550 Configuration -*/ -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* -* select serial console configuration -*/ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 1 -#define CONFIG_SERIAL1 1/* UART1 on OMAP3 EVM */ #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1#define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200}/* * I2C
include/configs/omap3_logic.h +2 -19
@@ -53,28 +53,11 @@* Hardware drivers */ -/* -* NS16550 Configuration -*/ -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* -* select serial console configuration -*/ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 1#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 -#define CONFIG_SERIAL1 1/* UART1 on OMAP Logic boards */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} +#define CONFIG_GENERIC_MMC #define CONFIG_MMC #define CONFIG_OMAP_HSMMC
include/configs/omap3_mvblx.h +5 -18
@@ -44,6 +44,9 @@* Override the common platform file choices. */ +/* disallow overwriting serial# and ethaddr */ +#undef CONFIG_ENV_OVERWRITE +/* * Other configuration options */
@@ -57,26 +60,11 @@* Hardware drivers */ -/* -* NS16550 Configuration -*/ -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* -* select serial console configuration -*/ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3/* UART3 */ -#define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} +#define CONFIG_GENERIC_MMC 1#define CONFIG_MMC 1#define CONFIG_OMAP_HSMMC 1
@@ -133,7 +121,6 @@#define CONFIG_TWL4030_POWER 1/* Environment information */ -#undef CONFIG_ENV_OVERWRITE/* disallow overwriting serial# and ethaddr */ #define CONFIG_BOOTDELAY 3#define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/omap3_overo.h +2 -19
@@ -40,28 +40,11 @@* Hardware drivers */ -/* -* NS16550 Configuration -*/ -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* -* select serial console configuration -*/ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \ - 115200} +#define CONFIG_GENERIC_MMC #define CONFIG_MMC #define CONFIG_OMAP_HSMMC
include/configs/omap3_pandora.h +2 -19
@@ -56,28 +56,11 @@#define CONFIG_USB_DEVICE 1#define CONFIG_USB_TTY 1 -/* -* NS16550 Configuration -*/ -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* -* select serial console configuration -*/ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \ - 115200} +#define CONFIG_GENERIC_MMC 1#define CONFIG_MMC 1#define CONFIG_OMAP_HSMMC 1
include/configs/omap3_sdp3430.h +2 -19
@@ -69,16 +69,7 @@#define CONFIG_TWL4030_POWER 1/* -* serial port - NS16550 compatible -*/ -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* Original SDP u-boot used UART1 and thus J8 (innermost); that can be +* Original SDP u-boot used UART1 and thus J8 (innermost); that can be * swapped with UART2 via jumpering. Downsides of using J8: it doesn't * support UART boot (that's only for UART3); it prevents sharing a Linux * kernel (LL_DEBUG_UART3) or filesystem (getty ttyS2) with most boards.
@@ -88,22 +79,17 @@* since UART3 isn't in the CORE power domain, it may be a bit less * usable in certain PM-sensitive debug scenarios. */ +#define CONFIG_BAUDRATE 115200#undef CONSOLE_J9/* else J8/UART1 (innermost) */ #ifdef CONSOLE_J9 #define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3/* UART3 */ #else #define CONFIG_CONS_INDEX 1#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 -#define CONFIG_SERIAL1 1/* UART1 */ #endif -#define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200}/* * I2C for power management setup
@@ -196,9 +182,6 @@* Network booting environment must be configured@site. */ -/* allow overwriting serial config and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x82000000\0" \ "console=ttyS0,115200n8\0" \
include/configs/omap3_zoom1.h +2 -19
@@ -50,28 +50,11 @@* Hardware drivers */ -/* -* NS16550 Configuration -*/ -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* -* select serial console configuration -*/ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3/* UART3 */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} +#define CONFIG_GENERIC_MMC 1#define CONFIG_MMC 1#define CONFIG_OMAP_HSMMC 1
include/configs/omap3_zoom2.h +3 -10
@@ -34,6 +34,7 @@* Values that differ from platform defaults or are unspecified. */ #define CONFIG_SDRC /* The chip has SDRC controller */ +#define CONFIG_SERIAL_MULTI /* Platform defaults */ #include <configs/omap3_common.h>
@@ -54,30 +55,22 @@/* * NS16550 Configuration * Zoom2 uses the TL16CP754C on the debug board -*/ -#define CONFIG_SERIAL_MULTI 1 -/* +* * 0 - 1 : first USB with respect to the left edge of the debug board * 2 - 3 : second USB with respect to the left edge of the debug board */ #define ZOOM2_DEFAULT_SERIAL_DEVICE (&zoom2_serial_device0) -#define V_NS16550_CLK (1843200)/* 1.8432 Mhz */ -#define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_REG_SIZE (-2) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK +#define CONFIG_SYS_NS16550_CLK (1843200)/* 1.8432 Mhz */ #define CONFIG_BAUDRATE 115200#define CONFIG_SYS_BAUDRATE_TABLE {115200} -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_GENERIC_MMC 1#define CONFIG_MMC 1#define CONFIG_OMAP_HSMMC 1#define CONFIG_DOS_PARTITION 1 -/* Status LED */ #define CONFIG_STATUS_LED 1/* Status LED enabled */ #define CONFIG_BOARD_SPECIFIC_LED 1
include/configs/tam3517-common.h +1 -17
@@ -52,26 +52,10 @@* Hardware drivers */ -/* -* NS16550 Configuration -*/ -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ - -/* -* select serial console configuration -*/ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 1#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 -#define CONFIG_SERIAL1 /* UART1 */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200}#define CONFIG_MMC #define CONFIG_OMAP_HSMMC #define CONFIG_GENERIC_MMC
include/configs/tricorder.h +1 -12
@@ -59,19 +59,11 @@/* Hardware drivers */ -/* NS16550 Configuration */ -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ -/* select serial console configuration */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3#define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200}/* MMC */ #define CONFIG_GENERIC_MMC
@@ -136,9 +128,6 @@#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_MTD_PARTITIONS -/* Environment information */ -#define CONFIG_ENV_OVERWRITE /* allow to overwrite serial and ethaddr */ -#define CONFIG_BOOTDELAY 3#define CONFIG_EXTRA_ENV_SETTINGS \
Signature · 1 line
1.7.0.4
RFC 8/11 omap3: Consolidate UART information in omap3_common.h
Quoted 6 lines · On Thursday 22 March 2012 15:09:14 Tom Rini wrote:
Unless a board defines
CONFIG_SERIAL_MULTIwe assume it is using an on-module UART somewhere. We leave the exact configuration per-board.Start an environment section in
omap3_common.hand default to allowing the environment to override console/ethaddr.omap3_mvblxretains its behavior via opt-out.
not a big deal, but it seems like the env settings slipped in after the fact
Quoted 5 lines
include/configs/omap3_common.h +2
-0+/* +* Default serial port configuration is an NS16550-compatible UART.
include/configs/omap3_common.h line 90
Quoted 10 lines
include/configs/omap3_common.h +10
-0+* Boards can override this as needed with CONFIG_SERIAL_MULTI +*/ +#ifndef CONFIG_SERIAL_MULTI +#define CONFIG_SYS_NS16550 +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE (-4) +#define CONFIG_SYS_NS16550_CLK 48000000 +#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ + 115200} +#endif
the baudrate table is fairly independent of the serial driver. might want to split that out into its own ifndef/define/endif check.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120403/59b060b2/attachment.pgp>
RFC 8/11 omap3: Consolidate UART information in omap3_common.h
Quoted 9 lines · Mike Frysinger
Quoted 6 lines · On Thursday 22 March 2012 15:09:14 Tom Rini wrote:
Unless a board defines
CONFIG_SERIAL_MULTIwe assume it is using an on-module UART somewhere. We leave the exact configuration per-board.Start an environment section in
omap3_common.hand default to allowing the environment to override console/ethaddr.omap3_mvblxretains its behavior via opt-out.not a big deal, but it seems like the env settings slipped in after the fact
Yeah, I had to think a few times about how to split-up some of the serial/console related stuff.
Quoted 18 lines
Quoted 5 lines
include/configs/omap3_common.h +2
-0+/* +* Default serial port configuration is an NS16550-compatible UART. include/configs/omap3_common.h line 90
Quoted 10 lines
include/configs/omap3_common.h +10
-0+* Boards can override this as needed with CONFIG_SERIAL_MULTI +*/ +#ifndef CONFIG_SERIAL_MULTI +#define CONFIG_SYS_NS16550 +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE (-4) +#define CONFIG_SYS_NS16550_CLK 48000000 +#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ + 115200} +#endif the baudrate table is fairly independent of the serial driver. might want to split that out into its own ifndef/define/endif check.
What I really wanted here was a test for "not using the SoM UART". Looking at the examples we have today, it's either the SoM and the above table but differing in which UART is physically exposed or it's SERIAL_MULTI and wants it's own baudrate table.
Part of me thinks I should whack at include/config_defaults.h and add something like #ifndef CONFIG_SYS_BAUDRATE_TABLE, standard rates, #endif. And same for CONFIG_SYS_PROMPT_HUSH_PS2 and probably a few others.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120403/a5e7f35b/attachment.pgp>
RFC 8/11 omap3: Consolidate UART information in omap3_common.h
Quoted 21 lines · On Tuesday 03 April 2012 19:45:11 Tom Rini wrote:
Quoted 4 lines · Mike Frysinger
Quoted 3 lines · On Thursday 22 March 2012 15:09:14 Tom Rini wrote:
include/configs/omap3_common.h +0
-0Quoted 15 lines
include/configs/omap3_common.h line 90
Quoted 12 lines
include/configs/omap3_common.h +12
-0+/* +* Default serial port configuration is an NS16550-compatible UART. +* Boards can override this as needed with CONFIG_SERIAL_MULTI +*/ +#ifndef CONFIG_SERIAL_MULTI +#define CONFIG_SYS_NS16550 +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE (-4) +#define CONFIG_SYS_NS16550_CLK 48000000 +#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ + 115200} +#endif the baudrate table is fairly independent of the serial driver. might want to split that out into its own ifndef/define/endif check.
Quoted 4 lines
What I really wanted here was a test for "not using the SoM UART". Looking at the examples we have today, it's either the SoM and the above table but differing in which UART is physically exposed or it's
SERIAL_MULTIand wants it's own baudrate table.
not sure what you mean. CONFIG_SYS_BAUDRATE_TABLE is used in common/cmd_nvedit.c, so i'm not sure what you mean by having diff values depending on the diff uart setups ...
Quoted 4 lines
Part of me thinks I should whack at
include/config_defaults.hand add something like #ifndefCONFIG_SYS_BAUDRATE_TABLE, standard rates, #endif. And same forCONFIG_SYS_PROMPT_HUSH_PS2and probably a few others.
would make sense to me, although i'd cut out 4800 from the default list -mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120403/f7ab5821/attachment.pgp>
RFC 8/11 omap3: Consolidate UART information in omap3_common.h
Quoted 22 lines · Mike Frysinger
Quoted 21 lines · On Tuesday 03 April 2012 19:45:11 Tom Rini wrote:
Quoted 19 lines · Mike Frysinger
Quoted 5 lines · On Thursday 22 March 2012 15:09:14 Tom Rini wrote:
include/configs/omap3_common.h +2
-0+/* +* Default serial port configuration is an NS16550-compatible UART. include/configs/omap3_common.h line 90
Quoted 10 lines
include/configs/omap3_common.h +10
-0+* Boards can override this as needed with CONFIG_SERIAL_MULTI +*/ +#ifndef CONFIG_SERIAL_MULTI +#define CONFIG_SYS_NS16550 +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE (-4) +#define CONFIG_SYS_NS16550_CLK 48000000 +#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ + 115200} +#endif the baudrate table is fairly independent of the serial driver. might want to split that out into its own ifndef/define/endif check.
Quoted 8 lines
Quoted 4 lines
What I really wanted here was a test for "not using the SoM UART". Looking at the examples we have today, it's either the SoM and the above table but differing in which UART is physically exposed or it's
SERIAL_MULTIand wants it's own baudrate table.not sure what you mean.
CONFIG_SYS_BAUDRATE_TABLEis used incommon/cmd_nvedit.c, so i'm not sure what you mean by having diff values depending on the diff uart setups ...
The example here is the omap3_zoom2. It doesn't use the SoM UART, sets SERIAL_MULTI and defines the baudrate table to just 115200. This is why I stuck the baudrate table in with !SERIAL_MULTI.
Quoted 6 lines
Quoted 4 lines
Part of me thinks I should whack at
include/config_defaults.hand add something like #ifndefCONFIG_SYS_BAUDRATE_TABLE, standard rates, #endif. And same forCONFIG_SYS_PROMPT_HUSH_PS2and probably a few others.would make sense to me, although i'd cut out 4800 from the default list
Agreed.
Signature · 1 line
Tom
RFC 9/11 omap3: Consolidate HSMMC support into omap3_common.h
In reply to Tom RiniSigned-off-by Tom Rini <[email protected]>
--- include/configs/am3517_crane.h | 5 ----- include/configs/am3517_evm.h | 4 ---- include/configs/cm_t35.h | 5 ----- include/configs/devkit8000.h | 6 ------ include/configs/dig297.h | 5 ----- include/configs/igep00x0.h | 5 ----- include/configs/mcx.h | 4 ---- include/configs/omap3_beagle.h | 5 ----- include/configs/omap3_common.h | 9 +++++++++ include/configs/omap3_evm.h | 9 +-------- include/configs/omap3_evm_quick_mmc.h | 6 ------ include/configs/omap3_evm_quick_nand.h | 1 + include/configs/omap3_logic.h | 5 ----- include/configs/omap3_mvblx.h | 5 ----- include/configs/omap3_overo.h | 5 ----- include/configs/omap3_pandora.h | 5 ----- include/configs/omap3_sdp3430.h | 7 ------- include/configs/omap3_zoom1.h | 5 ----- include/configs/omap3_zoom2.h | 4 ---- include/configs/tam3517-common.h | 4 ---- include/configs/tricorder.h | 6 ------ 21 files changed, 11 insertions(+), 99 deletions(-)
include/configs/am3517_crane.h +0 -5
@@ -56,11 +56,6 @@#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3#define CONFIG_BAUDRATE 115200 -#define CONFIG_GENERIC_MMC 1 -#define CONFIG_MMC 1 -#define CONFIG_OMAP_HSMMC 1 -#define CONFIG_DOS_PARTITION 1 -/* * USB configuration * Enable CONFIG_MUSB_HCD for Host functionalities MSC, keyboard
include/configs/am3517_evm.h +0 -4
@@ -55,10 +55,6 @@#define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3#define CONFIG_BAUDRATE 115200 -#define CONFIG_MMC 1 -#define CONFIG_GENERIC_MMC 1 -#define CONFIG_OMAP_HSMMC 1 -#define CONFIG_DOS_PARTITION 1/* * USB configuration
include/configs/cm_t35.h +0 -5
@@ -69,11 +69,6 @@#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3#define CONFIG_BAUDRATE 115200 -#define CONFIG_GENERIC_MMC -#define CONFIG_MMC -#define CONFIG_OMAP_HSMMC -#define CONFIG_DOS_PARTITION -/* USB */ #define CONFIG_MUSB_UDC #define CONFIG_USB_OMAP3
include/configs/devkit8000.h +0 -6
@@ -72,12 +72,6 @@#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3#define CONFIG_BAUDRATE 115200 -/* MMC */ -#define CONFIG_GENERIC_MMC 1 -#define CONFIG_MMC 1 -#define CONFIG_OMAP_HSMMC 1 -#define CONFIG_DOS_PARTITION 1 -/* I2C */ #define CONFIG_HARD_I2C 1#define CONFIG_SYS_I2C_SPEED 100000
include/configs/dig297.h +0 -5
@@ -67,11 +67,6 @@#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3#define CONFIG_BAUDRATE 115200 -#define CONFIG_GENERIC_MMC 1 -#define CONFIG_MMC 1 -#define CONFIG_OMAP_HSMMC 1 -#define CONFIG_DOS_PARTITION -/* library portions to compile in */ #define CONFIG_RBTREE #define CONFIG_MTD_PARTITIONS
include/configs/igep00x0.h +0 -5
@@ -44,11 +44,6 @@#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3#define CONFIG_BAUDRATE 115200 -#define CONFIG_GENERIC_MMC 1 -#define CONFIG_MMC 1 -#define CONFIG_OMAP_HSMMC 1 -#define CONFIG_DOS_PARTITION 1 -/* USB */ #define CONFIG_MUSB_UDC 1#define CONFIG_USB_OMAP3 1
include/configs/mcx.h +0 -4
@@ -63,10 +63,6 @@#define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3#define CONFIG_BAUDRATE 115200 -#define CONFIG_MMC -#define CONFIG_OMAP_HSMMC -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION /* EHCI */ #define CONFIG_USB_STORAGE
include/configs/omap3_beagle.h +0 -5
@@ -54,11 +54,6 @@#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3#define CONFIG_BAUDRATE 115200 -#define CONFIG_GENERIC_MMC 1 -#define CONFIG_MMC 1 -#define CONFIG_OMAP_HSMMC 1 -#define CONFIG_DOS_PARTITION 1 -/* Status LED */ #define CONFIG_STATUS_LED 1#define CONFIG_BOARD_SPECIFIC_LED 1
include/configs/omap3_common.h +9 -0
@@ -89,6 +89,15 @@ 115200}#endif +/* MMC */ +#define CONFIG_CMD_MMC +#if defined(CONFIG_CMD_MMC ) +#define CONFIG_GENERIC_MMC +#define CONFIG_MMC +#define CONFIG_OMAP_HSMMC +#define CONFIG_DOS_PARTITION +#endif +/* * Environmnet */
include/configs/omap3_evm.h +1 -8
@@ -69,11 +69,6 @@* ---------------------------------------------------------------------------- */ -/* MMC */ -#define CONFIG_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_OMAP_HSMMC -/* SPL */ #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_FAT_SUPPORT
@@ -82,12 +77,10 @@#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img" -/* Partition tables */ -/* Only need DOS partition support for SPL, currently */ +/* We can't use EFI partitions in SPL currently. */ #ifndef CONFIG_SPL_BUILD #define CONFIG_EFI_PARTITION #endif -#define CONFIG_DOS_PARTITION /* USB *
include/configs/omap3_evm_quick_mmc.h +0 -6
@@ -47,12 +47,6 @@* ---------------------------------------------------------------------------- */ -/* MMC */ -#define CONFIG_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_OMAP_HSMMC -#define CONFIG_DOS_PARTITION -/* ----------------------------------------------------------------------------- * Include common board configuration * -----------------------------------------------------------------------------
include/configs/omap3_evm_quick_nand.h +1 -0
@@ -25,6 +25,7 @@* ---------------------------------------------------------------------------- */ #define CONFIG_CMD_NAND +#undef CONFIG_CMD_MMC/* * Board revision is detected by probing the Ethernet chip.
include/configs/omap3_logic.h +0 -5
@@ -58,11 +58,6 @@#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1#define CONFIG_BAUDRATE 115200 -#define CONFIG_GENERIC_MMC -#define CONFIG_MMC -#define CONFIG_OMAP_HSMMC -#define CONFIG_DOS_PARTITION -/* commands to include */ #include <config_cmd_default.h>
include/configs/omap3_mvblx.h +0 -5
@@ -65,11 +65,6 @@#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3#define CONFIG_BAUDRATE 115200 -#define CONFIG_GENERIC_MMC 1 -#define CONFIG_MMC 1 -#define CONFIG_OMAP_HSMMC 1 -#define CONFIG_DOS_PARTITION 1 -/* USB */ #define CONFIG_MUSB_UDC 1#define CONFIG_USB_OMAP3 1
include/configs/omap3_overo.h +0 -5
@@ -45,11 +45,6 @@#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3#define CONFIG_BAUDRATE 115200 -#define CONFIG_GENERIC_MMC -#define CONFIG_MMC -#define CONFIG_OMAP_HSMMC -#define CONFIG_DOS_PARTITION -/* commands to include */ #include <config_cmd_default.h>
include/configs/omap3_pandora.h +0 -5
@@ -61,11 +61,6 @@#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3#define CONFIG_BAUDRATE 115200 -#define CONFIG_GENERIC_MMC 1 -#define CONFIG_MMC 1 -#define CONFIG_OMAP_HSMMC 1 -#define CONFIG_DOS_PARTITION 1 -/* commands to include */ #include <config_cmd_default.h>
include/configs/omap3_sdp3430.h +0 -7
@@ -148,13 +148,6 @@* MMC boot support */ -#if defined(CONFIG_CMD_MMC ) -#define CONFIG_GENERIC_MMC 1 -#define CONFIG_MMC 1 -#define CONFIG_OMAP_HSMMC 1 -#define CONFIG_DOS_PARTITION 1 -#endif -/*---------------------------------------------------------------------------- * SMSC9115 Ethernet from SMSC9118 family *----------------------------------------------------------------------------
include/configs/omap3_zoom1.h +0 -5
@@ -55,11 +55,6 @@#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3#define CONFIG_BAUDRATE 115200 -#define CONFIG_GENERIC_MMC 1 -#define CONFIG_MMC 1 -#define CONFIG_OMAP_HSMMC 1 -#define CONFIG_DOS_PARTITION 1 -/* USB */ #define CONFIG_MUSB_UDC 1#define CONFIG_USB_OMAP3 1
include/configs/omap3_zoom2.h +0 -4
@@ -67,10 +67,6 @@#define CONFIG_BAUDRATE 115200#define CONFIG_SYS_BAUDRATE_TABLE {115200} -#define CONFIG_GENERIC_MMC 1 -#define CONFIG_MMC 1 -#define CONFIG_OMAP_HSMMC 1 -#define CONFIG_DOS_PARTITION 1/* Status LED */ #define CONFIG_STATUS_LED 1/* Status LED enabled */ #define CONFIG_BOARD_SPECIFIC_LED 1
include/configs/tam3517-common.h +0 -4
@@ -56,10 +56,6 @@#define CONFIG_CONS_INDEX 1#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1#define CONFIG_BAUDRATE 115200 -#define CONFIG_MMC -#define CONFIG_OMAP_HSMMC -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION /* EHCI */ #define CONFIG_OMAP3_GPIO_5
include/configs/tricorder.h +0 -6
@@ -65,12 +65,6 @@#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3#define CONFIG_BAUDRATE 115200 -/* MMC */ -#define CONFIG_GENERIC_MMC -#define CONFIG_MMC -#define CONFIG_OMAP_HSMMC -#define CONFIG_DOS_PARTITION -/* I2C */ #define CONFIG_HARD_I2C #define CONFIG_SYS_I2C_SPEED 100000
Signature · 1 line
1.7.0.4
RFC 10/11 omap3: Consolidate NAND information in omap3_common.h
In reply to Tom RiniAdd common NAND information to omap3_common.h. For boards that use NAND, move CONFIG_CMD_NAND up to prior to <configs/omap3_common.h>
Signed-off-by Tom Rini <[email protected]>
--- include/configs/am3517_crane.h | 16 +--------------- include/configs/am3517_evm.h | 16 +--------------- include/configs/cm_t35.h | 17 +---------------- include/configs/devkit8000.h | 13 +------------ include/configs/dig297.h | 16 +--------------- include/configs/igep00x0.h | 4 ++-- include/configs/mcx.h | 17 ++--------------- include/configs/omap3_beagle.h | 18 ++---------------- include/configs/omap3_common.h | 14 ++++++++++++++ include/configs/omap3_evm_common.h | 12 ------------ include/configs/omap3_logic.h | 18 +----------------- include/configs/omap3_mvblx.h | 4 ++-- include/configs/omap3_overo.h | 17 +---------------- include/configs/omap3_pandora.h | 17 +---------------- include/configs/omap3_sdp3430.h | 5 ++--- include/configs/omap3_zoom1.h | 15 +-------------- include/configs/omap3_zoom2.h | 14 +------------- include/configs/tam3517-common.h | 15 +-------------- include/configs/tricorder.h | 14 +------------- 19 files changed, 36 insertions(+), 226 deletions(-)
include/configs/am3517_crane.h +1 -15
@@ -29,6 +29,7 @@* Values that differ from platform defaults or are unspecified. */ #define CONFIG_EMIF4 /* The chip has EMIF4 controller */ +#define CONFIG_CMD_NAND /* NAND support */ /* Platform defaults */ #include <configs/omap3_common.h>
@@ -103,7 +104,6 @@#define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ -#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING
@@ -112,7 +112,6 @@#undef CONFIG_CMD_IMI/* iminfo */ #undef CONFIG_CMD_IMLS/* List all found images */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_HARD_I2C 1#define CONFIG_SYS_I2C_SPEED 100000#define CONFIG_SYS_I2C_SLAVE 1
@@ -122,17 +121,6 @@#undef CONFIG_CMD_NET#undef CONFIG_CMD_NFS -/* -* Board NAND Info. -*/ -#define CONFIG_SYS_NAND_ADDR NAND_BASE/* physical address */ -/* to access nand */ -#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ -/* to access */ -/* nand at CS0 */ - -#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of */ -/* NAND devices */ #define CONFIG_JFFS2_NAND /* nand device jffs2 lives on */
@@ -249,8 +237,6 @@/* Monitor at start of flash */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_NAND_OMAP_GPMC -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1#define CONFIG_ENV_IS_IN_NAND 1#define SMNAND_ENV_OFFSET 0x260000/* environment starts here */
include/configs/am3517_evm.h +1 -15
@@ -29,6 +29,7 @@* Values that differ from platform defaults or are unspecified. */ #define CONFIG_EMIF4 /* The chip has EMIF4 controller */ +#define CONFIG_CMD_NAND /* NAND support */ /* Platform defaults */ #include <configs/omap3_common.h>
@@ -103,7 +104,6 @@#define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ -#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING
@@ -112,7 +112,6 @@#undef CONFIG_CMD_IMI/* iminfo */ #undef CONFIG_CMD_IMLS/* List all found images */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_HARD_I2C 1#define CONFIG_SYS_I2C_SPEED 100000#define CONFIG_SYS_I2C_SLAVE 1
@@ -122,17 +121,6 @@#undef CONFIG_CMD_NET#undef CONFIG_CMD_NFS -/* -* Board NAND Info. -*/ -#define CONFIG_SYS_NAND_ADDR NAND_BASE/* physical address */ -/* to access nand */ -#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ -/* to access */ -/* nand at CS0 */ - -#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of */ -/* NAND devices */ #define CONFIG_JFFS2_NAND /* nand device jffs2 lives on */ #define CONFIG_JFFS2_DEV "nand0"
@@ -249,8 +237,6 @@/* Monitor at start of flash */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_NAND_OMAP_GPMC -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1#define CONFIG_ENV_IS_IN_NAND 1#define SMNAND_ENV_OFFSET 0x260000/* environment starts here */
include/configs/cm_t35.h +1 -16
@@ -37,6 +37,7 @@*/ #define CONFIG_SDRC /* The chip has SDRC controller */ #define CONFIG_SERIAL_TAG /* Add SERIAL ATAG */ +#define CONFIG_CMD_NAND /* NAND support */ /* Platform defaults */ #include <configs/omap3_common.h>
@@ -95,7 +96,6 @@#define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ -#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING
@@ -103,7 +103,6 @@#undef CONFIG_CMD_FPGA/* FPGA configuration Support */ #undef CONFIG_CMD_IMLS/* List all found images */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_HARD_I2C #define CONFIG_SYS_I2C_SPEED 100000#define CONFIG_SYS_I2C_SLAVE 1
@@ -119,20 +118,6 @@#define CONFIG_TWL4030_POWER #define CONFIG_TWL4030_LED -/* -* Board NAND Info. -*/ -#define CONFIG_SYS_NAND_QUIET_TEST -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_SYS_NAND_ADDR NAND_BASE/* physical address */ -/* to access nand */ -#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ -/* to access nand at */ -/* CS0 */ -#define GPMC_NAND_ECC_LP_x16_LAYOUT - -#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND */ -/* devices */ #define CONFIG_JFFS2_NAND /* nand device jffs2 lives on */ #define CONFIG_JFFS2_DEV "nand0"
include/configs/devkit8000.h +1 -12
@@ -35,6 +35,7 @@* Values that differ from platform defaults or are unspecified. */ #define CONFIG_SDRC /* The chip has SDRC controller */ +#define CONFIG_CMD_NAND /* NAND support */ /* Platform defaults */ #include <configs/omap3_common.h>
@@ -85,7 +86,6 @@#define CONFIG_TWL4030_LED 1/* Board NAND Info */ -#define CONFIG_SYS_NO_FLASH /* no NOR flash */ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define MTDIDS_DEFAULT "nand0=nand"#define MTDPARTS_DEFAULT "mtdparts=nand:" \
@@ -95,16 +95,6 @@"4m(kernel)," \ "-(fs)" -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_SYS_NAND_ADDR NAND_BASE/* physical address */ -/* to access nand */ -#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ -/* to access nand at */ -/* CS0 */ -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1 - -#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND */ -/* devices */ #define CONFIG_JFFS2_NAND /* nand device jffs2 lives on */ #define CONFIG_JFFS2_DEV "nand0"
@@ -123,7 +113,6 @@#define CONFIG_CMD_JFFS2 /* JFFS2 Support */ #define CONFIG_CMD_MMC /* MMC support */ #define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */ -#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */ #undef CONFIG_CMD_FPGA/* FPGA configuration Support */
include/configs/dig297.h +1 -15
@@ -43,6 +43,7 @@* Values that differ from platform defaults or are unspecified. */ #define CONFIG_SDRC /* The chip has SDRC controller */ +#define CONFIG_CMD_NAND /* NAND support */ /* Platform defaults */ #include <configs/omap3_common.h>
@@ -86,7 +87,6 @@#define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ -#define CONFIG_CMD_NAND /* NAND support */ #undef CONFIG_CMD_FLASH/* flinfo, erase, protect */ #undef CONFIG_CMD_FPGA/* FPGA configuration Support */
@@ -95,7 +95,6 @@#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #undef CONFIG_CMD_NFS/* NFS support */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_HARD_I2C #define CONFIG_SYS_I2C_SPEED 100000#define CONFIG_SYS_I2C_SLAVE 1
@@ -109,19 +108,6 @@#define CONFIG_TWL4030_POWER #define CONFIG_TWL4030_LED -/* -* Board NAND Info. -*/ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_SYS_NAND_ADDR NAND_BASE/* physical address */ -/* to access nand */ -#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ -/* to access nand at */ -/* CS0 */ -#define GPMC_NAND_ECC_LP_x16_LAYOUT - -#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND */ -#if defined(CONFIG_CMD_NET )/* * SMSC9220 Ethernet
include/configs/igep00x0.h +2 -2
@@ -27,6 +27,7 @@* Values that differ from platform defaults or are unspecified. */ #define CONFIG_SDRC /* The chip has SDRC controller */ +#define CONFIG_ENV_SIZE (512 << 10)/* Total Size Environment */ /* Platform defaults */ #include <configs/omap3_common.h>
@@ -79,7 +80,6 @@#undef CONFIG_CMD_FLASH/* flinfo, erase, protect */ #undef CONFIG_CMD_IMLS/* List all found images */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_HARD_I2C 1#define CONFIG_SYS_I2C_SPEED 100000#define CONFIG_SYS_I2C_SLAVE 1
@@ -204,6 +204,7 @@* FLASH and environment organization */ +#define CONFIG_SYS_NO_FLASH #define PISMO1_ONEN_SIZE GPMC_SIZE_128M/* Configure the PISMO */ #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
@@ -211,7 +212,6 @@#define ONENAND_ENV_OFFSET 0x260000/* environment starts here */ #define CONFIG_ENV_IS_IN_ONENAND 1 -#define CONFIG_ENV_SIZE (512 << 10)/* Total Size Environment */ #define CONFIG_ENV_ADDR ONENAND_ENV_OFFSET/*
include/configs/mcx.h +2 -15
@@ -25,6 +25,7 @@* Values that differ from platform defaults or are unspecified. */ #define CONFIG_EMIF4 /* The chip has EMIF4 controller */ +#define CONFIG_CMD_NAND /* NAND support */ /* Platform defaults */ #include <configs/omap3_common.h>
@@ -88,7 +89,6 @@#define CONFIG_CMD_MMC /* MMC support */ #define CONFIG_CMD_FAT /* FAT support */ #define CONFIG_CMD_USB -#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING #define CONFIG_CMD_CACHE
@@ -105,7 +105,6 @@#undef CONFIG_CMD_IMI/* iminfo */ #undef CONFIG_CMD_IMLS/* List all found images */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_HARD_I2C #define CONFIG_SYS_I2C_SPEED 100000#define CONFIG_SYS_I2C_SLAVE 1
@@ -119,17 +118,7 @@#define CONFIG_CMD_NET #define CONFIG_CMD_MII #define CONFIG_CMD_NFS -/* -* Board NAND Info. -*/ -#define CONFIG_SYS_NAND_ADDR NAND_BASE/* physical address */ -/* to access nand */ -#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ -/* to access */ -/* nand at CS0 */ - -#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of */ -/* NAND devices */ +#define CONFIG_JFFS2_NAND /* nand device jffs2 lives on */ #define CONFIG_JFFS2_DEV "nand0"
@@ -236,8 +225,6 @@/* Configure the PISMO */ #define PISMO1_NAND_SIZE GPMC_SIZE_128M -#define CONFIG_NAND_OMAP_GPMC -#define GPMC_NAND_ECC_LP_x16_LAYOUT#define CONFIG_ENV_IS_IN_NAND #define SMNAND_ENV_OFFSET 0x260000/* environment starts here */
include/configs/omap3_beagle.h +2 -16
@@ -32,6 +32,7 @@* Values that differ from platform defaults or are unspecified. */ #define CONFIG_SDRC /* The chip has SDRC controller */ +#define CONFIG_CMD_NAND /* NAND support */ /* Platform defaults */ #include <configs/omap3_common.h>
@@ -116,7 +117,6 @@#define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ #define CONFIG_USB_STORAGE /* USB storage support */ -#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_LED /* LED support */ #define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #define CONFIG_CMD_NFS /* NFS support */
@@ -129,7 +129,6 @@#undef CONFIG_CMD_IMI/* iminfo */ #undef CONFIG_CMD_IMLS/* List all found images */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_HARD_I2C 1#define CONFIG_SYS_I2C_SPEED 100000#define CONFIG_SYS_I2C_SLAVE 1
@@ -145,20 +144,7 @@#define CONFIG_TWL4030_POWER 1#define CONFIG_TWL4030_LED 1 -/* -* Board NAND Info. -*/ -#define CONFIG_SYS_NAND_QUIET_TEST 1 -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_SYS_NAND_ADDR NAND_BASE/* physical address */ -/* to access nand */ -#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ -/* to access nand at */ -/* CS0 */ -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1 - -#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND */ -/* devices */ +#define CONFIG_JFFS2_NAND /* nand device jffs2 lives on */ #define CONFIG_JFFS2_DEV "nand0"
include/configs/omap3_common.h +14 -0
@@ -99,6 +99,20 @@#endif /* +* Default NAND information. +*/ +#if defined(CONFIG_CMD_NAND ) +#define CONFIG_SYS_NO_FLASH +#define CONFIG_SYS_NAND_QUIET_TEST +#define CONFIG_NAND_OMAP_GPMC +#define CONFIG_SYS_NAND_ADDR NAND_BASE +#define CONFIG_SYS_NAND_BASE NAND_BASE +#define GPMC_NAND_ECC_LP_x16_LAYOUT +/* At most, one NAND device will be supported. */ +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#endif + +/* * Environmnet */ #define CONFIG_ENV_OVERWRITE /* Allow to overwrite serial and ethaddr */
include/configs/omap3_evm_common.h +0 -12
@@ -108,15 +108,6 @@/* * NAND */ -/* Physical address to access NAND */ -#define CONFIG_SYS_NAND_ADDR NAND_BASE - -/* Physical address to access NAND at CS0 */ -#define CONFIG_SYS_NAND_BASE NAND_BASE - -/* Max number of NAND devices */ -#define CONFIG_SYS_MAX_NAND_DEVICE 1 -/* Timeout values (in ticks) */ #define CONFIG_SYS_FLASH_ERASE_TOUT (100 * CONFIG_SYS_HZ)#define CONFIG_SYS_FLASH_WRITE_TOUT (100 * CONFIG_SYS_HZ)
@@ -196,9 +187,6 @@*/ #if defined(CONFIG_CMD_NAND )#define CONFIG_SYS_FLASH_BASE PISMO1_NAND_BASE - -#define CONFIG_NAND_OMAP_GPMC -#define GPMC_NAND_ECC_LP_x16_LAYOUT#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET#elif defined(CONFIG_CMD_ONENAND )#define CONFIG_SYS_FLASH_BASE PISMO1_ONEN_BASE
include/configs/omap3_logic.h +1 -17
@@ -31,6 +31,7 @@* Values that differ from platform defaults or are unspecified. */ #define CONFIG_SDRC /* The chip has SDRC controller */ +#define CONFIG_CMD_NAND /* NAND support */ /* Platform defaults */ #include <configs/omap3_common.h>
@@ -74,7 +75,6 @@#define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ -#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */ #define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #define CONFIG_CMD_PING
@@ -86,7 +86,6 @@#undef CONFIG_CMD_IMI/* iminfo */ #undef CONFIG_CMD_IMLS/* List all found images */ -#define CONFIG_SYS_NO_FLASH /* * I2C
@@ -105,19 +104,6 @@*/ #define CONFIG_TWL4030_POWER -/* -* Board NAND Info. -*/ -#define CONFIG_SYS_NAND_QUIET_TEST -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_SYS_NAND_ADDR NAND_BASE/* physical address */ -/* to access nand */ -#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ -/* to access nand at */ -/* CS0 */ - -#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of */ -/* NAND devices */ #define CONFIG_JFFS2_NAND /* nand device jffs2 lives on */ #define CONFIG_JFFS2_DEV "nand0"
@@ -280,8 +266,6 @@#define SMNAND_ENV_OFFSET 0x260000/* environment starts here */ #if defined(CONFIG_CMD_NAND ) -#define CONFIG_NAND_OMAP_GPMC -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET#endif
include/configs/omap3_mvblx.h +2 -2
@@ -36,6 +36,8 @@*/ #define CONFIG_SDRC /* The chip has SDRC controller */ #define CONFIG_SERIAL_TAG /* Add SERIAL ATAG */ +/* We have a 2KiB sector size */ +#define CONFIG_ENV_SIZE (2 << 10)/* Platform defaults */ #include <configs/omap3_common.h>
@@ -53,8 +55,6 @@#define CONFIG_MVBLX /* working with mvBlueLYNX-X */ #define CONFIG_MACH_TYPE MACH_TYPE_MVBLX -/* We have a 2KiB sector size */ -#define CONFIG_ENV_SIZE (2 << 10)/* * Hardware drivers
include/configs/omap3_overo.h +1 -16
@@ -23,6 +23,7 @@* Values that differ from platform defaults or are unspecified. */ #define CONFIG_SDRC /* The chip has SDRC controller */ +#define CONFIG_CMD_NAND /* NAND support */ /* Platform defaults */ #include <configs/omap3_common.h>
@@ -55,7 +56,6 @@#define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ -#define CONFIG_CMD_NAND /* NAND support */ #undef CONFIG_CMD_FLASH/* flinfo, erase, protect */ #undef CONFIG_CMD_FPGA/* FPGA configuration Support */
@@ -64,7 +64,6 @@#undef CONFIG_CMD_NFS/* NFS support */ #define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_HARD_I2C #define CONFIG_SYS_I2C_SPEED 100000#define CONFIG_SYS_I2C_SLAVE 1
@@ -77,20 +76,6 @@#define CONFIG_TWL4030_POWER #define CONFIG_TWL4030_LED -/* -* Board NAND Info. -*/ -#define CONFIG_SYS_NAND_QUIET_TEST -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_SYS_NAND_ADDR NAND_BASE/* physical address */ -/* to access nand */ -#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ -/* to access nand */ -/* at CS0 */ -#define GPMC_NAND_ECC_LP_x16_LAYOUT - -#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND */ -/* devices */ #define CONFIG_JFFS2_NAND /* nand device jffs2 lives on */ #define CONFIG_JFFS2_DEV "nand0"
include/configs/omap3_pandora.h +1 -16
@@ -27,6 +27,7 @@* Values that differ from platform defaults or are unspecified. */ #define CONFIG_SDRC /* The chip has SDRC controller */ +#define CONFIG_CMD_NAND /* NAND support */ /* Platform defaults */ #include <configs/omap3_common.h>
@@ -69,7 +70,6 @@#define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ -#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_CACHE /* Cache control */ #undef CONFIG_CMD_FLASH/* flinfo, erase, protect */
@@ -79,7 +79,6 @@#undef CONFIG_CMD_NET/* bootp, tftpboot, rarpboot */ #undef CONFIG_CMD_NFS/* NFS support */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_HARD_I2C 1#define CONFIG_SYS_I2C_SPEED 100000#define CONFIG_SYS_I2C_SLAVE 1
@@ -93,20 +92,6 @@#define CONFIG_TWL4030_POWER 1#define CONFIG_TWL4030_LED 1 -/* -* Board NAND Info. -*/ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_SYS_NAND_ADDR NAND_BASE/* physical address */ -/* to access nand */ -#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ -/* to access nand */ -/* at CS0 */ -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1 - -#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND */ -/* devices */ -#ifdef CONFIG_CMD_NAND #define CONFIG_CMD_MTDPARTS #define CONFIG_MTD_PARTITIONS
include/configs/omap3_sdp3430.h +2 -3
@@ -43,6 +43,8 @@* Values that differ from platform defaults or are unspecified. */ #define CONFIG_SDRC /* The chip has SDRC controller */ +/* We have 256KiB for environment. */ +#define CONFIG_ENV_SIZE (256 << 10)/* Platform defaults */ #include <configs/omap3_common.h>
@@ -56,9 +58,6 @@*/ #define CONFIG_OMAP3_3430SDP /* working with SDP Rev2 */ -/* We have 256KiB for environment. */ -#define CONFIG_ENV_SIZE (256 << 10) -/* * Hardware drivers */
include/configs/omap3_zoom1.h +1 -14
@@ -33,6 +33,7 @@* Values that differ from platform defaults or are unspecified. */ #define CONFIG_SDRC /* The chip has SDRC controller */ +#define CONFIG_CMD_NAND /* NAND support */ /* Platform defaults */ #include <configs/omap3_common.h>
@@ -79,7 +80,6 @@#define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ -#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_NAND_LOCK_UNLOCK /* Enable lock/unlock support */ #undef CONFIG_CMD_FLASH/* flinfo, erase, protect */
@@ -103,19 +103,6 @@#define CONFIG_TWL4030_POWER 1#define CONFIG_TWL4030_LED 1 -/* -* Board NAND Info. -*/ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_SYS_NAND_ADDR NAND_BASE/* physical address */ -/* to access nand */ -#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ -/* to access nand at */ -/* CS0 */ -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1 - -#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND */ -/* devices */ #define CONFIG_JFFS2_NAND /* nand device jffs2 lives on */ #define CONFIG_JFFS2_DEV "nand0"
include/configs/omap3_zoom2.h +1 -13
@@ -35,6 +35,7 @@*/ #define CONFIG_SDRC /* The chip has SDRC controller */ #define CONFIG_SERIAL_MULTI +#define CONFIG_CMD_NAND /* NAND support */ /* Platform defaults */ #include <configs/omap3_common.h>
@@ -111,7 +112,6 @@#define CONFIG_CMD_FAT /* FAT support */ #define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ -#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_NAND_LOCK_UNLOCK /* Enable lock/unlock support */ #undef CONFIG_CMD_FLASH/* flinfo, erase, protect */
@@ -135,18 +135,6 @@#define CONFIG_TWL4030_POWER 1#define CONFIG_TWL4030_LED 1 -/* -* Board NAND Info. -*/ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_SYS_NAND_ADDR NAND_BASE/* physical address */ -/* to access nand */ -#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ -/* to access nand at */ -/* CS0 */ -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1 -#define CONFIG_SYS_MAX_NAND_DEVICE 1 -/* Environment information */ #define CONFIG_BOOTDELAY 10
include/configs/tam3517-common.h +1 -14
@@ -26,6 +26,7 @@* Values that differ from platform defaults or are unspecified. */ #define CONFIG_EMIF4 /* The chip has EMIF4 controller */ +#define CONFIG_CMD_NAND /* NAND support */ /* Platform defaults */ #include <configs/omap3_common.h>
@@ -82,14 +83,12 @@#define CONFIG_CMD_MMC /* MMC support */ #define CONFIG_CMD_NET #define CONFIG_CMD_NFS -#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_PING #define CONFIG_CMD_USB #undef CONFIG_CMD_FLASH/* only NAND on the SOM */ #undef CONFIG_CMD_IMLS -#define CONFIG_SYS_NO_FLASH #define CONFIG_HARD_I2C #define CONFIG_SYS_I2C_SPEED 400000#define CONFIG_SYS_I2C_SLAVE 1
@@ -98,16 +97,6 @@#define CONFIG_DRIVER_OMAP34XX_I2C -/* -* Board NAND Info. -*/ -#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ -/* to access */ -/* nand at CS0 */ - -#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of */ -/* NAND devices */ -#define CONFIG_AUTO_COMPLETE /*
@@ -167,8 +156,6 @@/* Configure the PISMO */ #define PISMO1_NAND_SIZE GPMC_SIZE_128M -#define CONFIG_NAND_OMAP_GPMC -#define GPMC_NAND_ECC_LP_x16_LAYOUT#define CONFIG_ENV_IS_IN_NAND #define SMNAND_ENV_OFFSET 0x180000/* environment starts here */
include/configs/tricorder.h +1 -13
@@ -36,6 +36,7 @@* Values that differ from platform defaults or are unspecified. */ #define CONFIG_SDRC /* The chip has SDRC controller */ +#define CONFIG_CMD_NAND /* NAND support */ /* Platform defaults */ #include <configs/omap3_common.h>
@@ -78,7 +79,6 @@#define CONFIG_TWL4030_LED /* Board NAND Info */ -#define CONFIG_SYS_NO_FLASH /* no NOR flash */ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define MTDIDS_DEFAULT "nand0=nand"#define MTDPARTS_DEFAULT "mtdparts=nand:" \
@@ -88,17 +88,6 @@"4m(kernel)," \"-(fs)" -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_SYS_NAND_ADDR NAND_BASE/* physical address */ -/* to access nand */ -#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ -/* to access nand at */ -/* CS0 */ -#define GPMC_NAND_ECC_LP_x16_LAYOUT 1 - -#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND */ -/* devices */ - /* commands to include */#include <config_cmd_default.h>
@@ -107,7 +96,6 @@#define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ #define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */ -#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */ #define CONFIG_CMD_UBI /* UBIFS commands */
Signature · 1 line
1.7.0.4
RFC 11/11 omap3: Consolidate I2C information into omap3_common.h
In reply to Tom RiniWe default to standard speed for i2c and allow boards to override with fast or full-speed. This also removes a number of unused defines.
Signed-off-by Tom Rini <[email protected]>
--- include/configs/am3517_crane.h | 6 +----- include/configs/am3517_evm.h | 6 +----- include/configs/cm_t35.h | 6 +----- include/configs/devkit8000.h | 7 +------ include/configs/dig297.h | 6 +----- include/configs/igep00x0.h | 6 +----- include/configs/mcx.h | 5 +---- include/configs/omap3_beagle.h | 7 +------ include/configs/omap3_common.h | 11 +++++++++++ include/configs/omap3_evm_common.h | 10 +--------- include/configs/omap3_logic.h | 12 +----------- include/configs/omap3_mvblx.h | 7 +------ include/configs/omap3_overo.h | 5 +---- include/configs/omap3_pandora.h | 6 +----- include/configs/omap3_sdp3430.h | 10 +--------- include/configs/omap3_zoom1.h | 7 +------ include/configs/omap3_zoom2.h | 7 +------ include/configs/tam3517-common.h | 6 +----- include/configs/tricorder.h | 7 +------ 19 files changed, 29 insertions(+), 108 deletions(-)
include/configs/am3517_crane.h +1 -5
@@ -112,12 +112,8 @@#undef CONFIG_CMD_IMI/* iminfo */ #undef CONFIG_CMD_IMLS/* List all found images */ -#define CONFIG_HARD_I2C 1 -#define CONFIG_SYS_I2C_SPEED 100000 +/* Our i2c slave is 1 */ #define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_BUS 0 -#define CONFIG_SYS_I2C_BUS_SELECT 1 -#define CONFIG_DRIVER_OMAP34XX_I2C 1#undef CONFIG_CMD_NET#undef CONFIG_CMD_NFS
include/configs/am3517_evm.h +1 -5
@@ -112,12 +112,8 @@#undef CONFIG_CMD_IMI/* iminfo */ #undef CONFIG_CMD_IMLS/* List all found images */ -#define CONFIG_HARD_I2C 1 -#define CONFIG_SYS_I2C_SPEED 100000 +/* Our i2c slave is 1 */ #define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_BUS 0 -#define CONFIG_SYS_I2C_BUS_SELECT 1 -#define CONFIG_DRIVER_OMAP34XX_I2C 1#undef CONFIG_CMD_NET#undef CONFIG_CMD_NFS
include/configs/cm_t35.h +1 -5
@@ -103,12 +103,8 @@#undef CONFIG_CMD_FPGA/* FPGA configuration Support */ #undef CONFIG_CMD_IMLS/* List all found images */ -#define CONFIG_HARD_I2C -#define CONFIG_SYS_I2C_SPEED 100000 +/* Our i2c slave is 1 */ #define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_BUS 0 -#define CONFIG_SYS_I2C_BUS_SELECT 1 -#define CONFIG_DRIVER_OMAP34XX_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
include/configs/devkit8000.h +1 -6
@@ -73,13 +73,8 @@#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3#define CONFIG_BAUDRATE 115200 -/* I2C */ -#define CONFIG_HARD_I2C 1 -#define CONFIG_SYS_I2C_SPEED 100000 +/* Our i2c slave is 1 */ #define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_BUS 0 -#define CONFIG_SYS_I2C_BUS_SELECT 1 -#define CONFIG_DRIVER_OMAP34XX_I2C 1/* TWL4030 */ #define CONFIG_TWL4030_POWER 1
include/configs/dig297.h +1 -5
@@ -95,12 +95,8 @@#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #undef CONFIG_CMD_NFS/* NFS support */ -#define CONFIG_HARD_I2C -#define CONFIG_SYS_I2C_SPEED 100000 +/* Our i2c slave is 1 */ #define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_BUS 0 -#define CONFIG_SYS_I2C_BUS_SELECT 1 -#define CONFIG_DRIVER_OMAP34XX_I2C 1/* * TWL4030
include/configs/igep00x0.h +1 -5
@@ -80,12 +80,8 @@#undef CONFIG_CMD_FLASH/* flinfo, erase, protect */ #undef CONFIG_CMD_IMLS/* List all found images */ -#define CONFIG_HARD_I2C 1 -#define CONFIG_SYS_I2C_SPEED 100000 +/* Our i2c slave is 1 */ #define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_BUS 0 -#define CONFIG_SYS_I2C_BUS_SELECT 1 -#define CONFIG_DRIVER_OMAP34XX_I2C 1/* * TWL4030
include/configs/mcx.h +1 -4
@@ -105,11 +105,8 @@#undef CONFIG_CMD_IMI/* iminfo */ #undef CONFIG_CMD_IMLS/* List all found images */ -#define CONFIG_HARD_I2C -#define CONFIG_SYS_I2C_SPEED 100000 +/* Our i2c slave is 1 */ #define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_BUS 0 -#define CONFIG_DRIVER_OMAP34XX_I2C /* RTC */ #define CONFIG_RTC_DS1337
include/configs/omap3_beagle.h +1 -6
@@ -129,13 +129,8 @@#undef CONFIG_CMD_IMI/* iminfo */ #undef CONFIG_CMD_IMLS/* List all found images */ -#define CONFIG_HARD_I2C 1 -#define CONFIG_SYS_I2C_SPEED 100000 +/* Our i2c slave is 1 */ #define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_BUS 0 -#define CONFIG_SYS_I2C_BUS_SELECT 1 -#define CONFIG_I2C_MULTI_BUS 1 -#define CONFIG_DRIVER_OMAP34XX_I2C 1#define CONFIG_VIDEO_OMAP3 /* DSS Support */ /*
include/configs/omap3_common.h +11 -0
@@ -89,6 +89,17 @@ 115200}#endif +/* +* I2C support. We default to standard speed but allow boards to specify +* fast or high-speed. +* */ +#define CONFIG_CMD_I2C +#define CONFIG_HARD_I2C +#ifndef CONFIG_SYS_I2C_SPEED +#define CONFIG_SYS_I2C_SPEED 100000 +#endif +#define CONFIG_DRIVER_OMAP34XX_I2C +/* MMC */ #define CONFIG_CMD_MMC #if defined(CONFIG_CMD_MMC )
include/configs/omap3_evm_common.h +1 -9
@@ -77,16 +77,8 @@#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1#define CONFIG_BAUDRATE 115200 -/* -* I2C -*/ -#define CONFIG_HARD_I2C -#define CONFIG_DRIVER_OMAP34XX_I2C - -#define CONFIG_SYS_I2C_SPEED 100000 +/* Our i2c slave is 1 */ #define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_BUS 0 -#define CONFIG_SYS_I2C_BUS_SELECT 1/* * PISMO support
include/configs/omap3_logic.h +1 -11
@@ -86,18 +86,8 @@#undef CONFIG_CMD_IMI/* iminfo */ #undef CONFIG_CMD_IMLS/* List all found images */ - -/* -* I2C -*/ -#define CONFIG_HARD_I2C -#define CONFIG_DRIVER_OMAP34XX_I2C - -#define CONFIG_SYS_I2C_SPEED 100000 +/* Our i2c slave is 1 */ #define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_BUS 0 -#define CONFIG_SYS_I2C_BUS_SELECT 1 -#define CONFIG_I2C_MULTI_BUS /* * TWL4030
include/configs/omap3_mvblx.h +1 -6
@@ -102,13 +102,8 @@#define CONFIG_CMD_PING #define CONFIG_CMD_FPGA -#define CONFIG_HARD_I2C 1 -#define CONFIG_SYS_I2C_SPEED 100000 +/* Our i2c slave is 0 */ #define CONFIG_SYS_I2C_SLAVE 0 -#define CONFIG_SYS_I2C_BUS 0/* This isn't used anywhere ?? */ -#define CONFIG_SYS_I2C_BUS_SELECT 1/* This isn't used anywhere ?? */ -#define CONFIG_DRIVER_OMAP34XX_I2C 1 -#define CONFIG_I2C_MULTI_BUS 1/* * TWL4030
include/configs/omap3_overo.h +1 -4
@@ -64,11 +64,8 @@#undef CONFIG_CMD_NFS/* NFS support */ #define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ -#define CONFIG_HARD_I2C -#define CONFIG_SYS_I2C_SPEED 100000 +/* Our i2c slave is 1 */ #define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_I2C_MULTI_BUS -#define CONFIG_DRIVER_OMAP34XX_I2C /* * TWL4030
include/configs/omap3_pandora.h +1 -5
@@ -79,12 +79,8 @@#undef CONFIG_CMD_NET/* bootp, tftpboot, rarpboot */ #undef CONFIG_CMD_NFS/* NFS support */ -#define CONFIG_HARD_I2C 1 -#define CONFIG_SYS_I2C_SPEED 100000 +/* Our i2c slave is 1 */ #define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_BUS 0 -#define CONFIG_SYS_I2C_BUS_SELECT 1 -#define CONFIG_DRIVER_OMAP34XX_I2C 1/* * TWL4030
include/configs/omap3_sdp3430.h +1 -9
@@ -89,16 +89,8 @@#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1#endif - -/* -* I2C for power management setup -*/ -#define CONFIG_HARD_I2C 1 -#define CONFIG_SYS_I2C_SPEED 100000 +/* Our i2c slave is 1 */ #define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_BUS 0 -#define CONFIG_SYS_I2C_BUS_SELECT 1 -#define CONFIG_DRIVER_OMAP34XX_I2C 1/* OMITTED: single 1 Gbit MT29F1G NAND flash */
include/configs/omap3_zoom1.h +1 -6
@@ -89,13 +89,8 @@#undef CONFIG_CMD_NET/* bootp, tftpboot, rarpboot */ #undef CONFIG_CMD_NFS/* NFS support */ -#define CONFIG_SYS_NO_FLASH -#define CONFIG_HARD_I2C 1 -#define CONFIG_SYS_I2C_SPEED 100000 +/* Our i2c slave is 1 */ #define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_BUS 0 -#define CONFIG_SYS_I2C_BUS_SELECT 1 -#define CONFIG_DRIVER_OMAP34XX_I2C 1/* * TWL4030
include/configs/omap3_zoom2.h +1 -6
@@ -121,13 +121,8 @@#undef CONFIG_CMD_NET/* bootp, tftpboot, rarpboot */ #undef CONFIG_CMD_NFS/* NFS support */ -#define CONFIG_SYS_NO_FLASH -#define CONFIG_HARD_I2C 1 -#define CONFIG_SYS_I2C_SPEED 100000 +/* Our i2c slave is 1 */ #define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_BUS 0 -#define CONFIG_SYS_I2C_BUS_SELECT 1 -#define CONFIG_DRIVER_OMAP34XX_I2C 1/* * TWL4030
include/configs/tam3517-common.h +1 -5
@@ -89,13 +89,9 @@#undef CONFIG_CMD_FLASH/* only NAND on the SOM */ #undef CONFIG_CMD_IMLS -#define CONFIG_HARD_I2C +/* Use fast mode i2c and our i2c slave is 1 */ #define CONFIG_SYS_I2C_SPEED 400000#define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_BUS 0 -#define CONFIG_SYS_I2C_BUS_SELECT 1 -#define CONFIG_DRIVER_OMAP34XX_I2C -#define CONFIG_AUTO_COMPLETE
include/configs/tricorder.h +1 -6
@@ -66,13 +66,8 @@#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3#define CONFIG_BAUDRATE 115200 -/* I2C */ -#define CONFIG_HARD_I2C -#define CONFIG_SYS_I2C_SPEED 100000 +/* Our i2c slave is 1 */ #define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_BUS 0 -#define CONFIG_SYS_I2C_BUS_SELECT 1 -#define CONFIG_DRIVER_OMAP34XX_I2C 1/* TWL4030 */ #define CONFIG_TWL4030_POWER
Signature · 1 line
1.7.0.4
cover : Add <configs/omap3_common.h>
In reply to Tom RiniQuoted 10 lines · On Thursday 22 March 2012 15:09:06 Tom Rini wrote:
Here's something I've talked about a bit before. This series adds
include/configs/omap3_common.hand makes allCONFIG_OMAP34XXboards use it. This particular round of posting doesn't directly apply as I'm working off of a series of cleanups that I'll post once I'm sure I don't find any others from doing this (unused CONFIG options) general series. What I'm really looking for is feedback on the implementation, namely what I lay out in the first patch of a section to set before usingomap3_common.h, including, and a section for afteromap3_common.h. The series isn't nearly complete but introduces at least one example of a "our board isn't like all the others" in each of the sections.
seems like for the most part this is soc-specific default configs, and one or two might be a vendor (TI) specific defaults (which aren't really harmful). the patches as-is generally look OK, but i wonder if we shouldn't expand the arm asm/config.h to tail into an asm/arch/config.h so these soc-specific defaults can live there rather than include/configs/.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120403/649e136b/attachment.pgp>
cover : Add <configs/omap3_common.h>
Quoted 12 lines · Mike Frysinger
Quoted 10 lines · On Thursday 22 March 2012 15:09:06 Tom Rini wrote:
Here's something I've talked about a bit before. This series adds
include/configs/omap3_common.hand makes allCONFIG_OMAP34XXboards use it. This particular round of posting doesn't directly apply as I'm working off of a series of cleanups that I'll post once I'm sure I don't find any others from doing this (unused CONFIG options) general series. What I'm really looking for is feedback on the implementation, namely what I lay out in the first patch of a section to set before usingomap3_common.h, including, and a section for afteromap3_common.h. The series isn't nearly complete but introduces at least one example of a "our board isn't like all the others" in each of the sections.
Quoted 2 lines
seems like for the most part this is soc-specific default configs, and one or two might be a vendor (TI) specific defaults (which aren't really harmful).
There is a certain amount of this that can be shared with omap4/5/am33xx/davinci (since the IP is shared). I'm not sure of the best way to share that yet, but I wanted to do it in steps.
Quoted 3 lines
the patches as-is generally look OK, but i wonder if we shouldn't expand the arm
asm/config.hto tail into anasm/arch/config.hso these soc-specific defaults can live there rather thaninclude/configs/.
That's a good idea, I think. I'll give that a spin and see how it looks.
Signature · 1 line
Tom
cover : Add <configs/omap3_common.h>
Quoted 14 lines · On Tuesday 03 April 2012 19:35:05 Tom Rini wrote:
Quoted 13 lines · Mike Frysinger
Quoted 11 lines · On Thursday 22 March 2012 15:09:06 Tom Rini wrote:
Here's something I've talked about a bit before. This series adds
include/configs/omap3_common.hand makes allCONFIG_OMAP34XXboards use it. This particular round of posting doesn't directly apply as I'm working off of a series of cleanups that I'll post once I'm sure I don't find any others from doing this (unused CONFIG options) general series. What I'm really looking for is feedback on the implementation, namely what I lay out in the first patch of a section to set before usingomap3_common.h, including, and a section for afteromap3_common.h. The series isn't nearly complete but introduces at least one example of a "our board isn't like all the others" in each of the sections.
Quoted 7 lines
Quoted 3 lines
seems like for the most part this is soc-specific default configs, and one or two might be a vendor (TI) specific defaults (which aren't really harmful).
There is a certain amount of this that can be shared with omap4/5/am33xx/davinci (since the IP is shared). I'm not sure of the best way to share that yet, but I wanted to do it in steps.
sure. this is an improvement, so might as well merge it since you've done the work.
Quoted 6 lines
Quoted 3 lines
the patches as-is generally look OK, but i wonder if we shouldn't expand the arm
asm/config.hto tail into anasm/arch/config.hso these soc-specific defaults can live there rather thaninclude/configs/.That's a good idea, I think. I'll give that a spin and see how it looks.
i've got the ADI (vendor) common stuff in include/configs/bfin_adi_common.h, but i've put quite a lot of sane stuff into the arch/blackfin/include/asm/config.h that makes sense at the arch level.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120403/929a3f47/attachment.pgp>