[U-Boot] [RFC v0 0/11]: 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(-)
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 trini@ti.com --- 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
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 71321f3..f58fede 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -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 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index bbd19de..d24ad01 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -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 diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index fe91c10..fe214eb 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -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 diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 2b6a6ee..f1ece51 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -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 diff --git a/include/configs/dig297.h b/include/configs/dig297.h index 1626b0e..5243b6a 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -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 diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h index d2b4b84..37284df 100644 --- a/include/configs/igep00x0.h +++ b/include/configs/igep00x0.h @@ -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 diff --git a/include/configs/mcx.h b/include/configs/mcx.h index e190e3e..6a6e0ec 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -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 diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h index 2034b59..efb544f 100644 --- a/include/configs/mt_ventoux.h +++ b/include/configs/mt_ventoux.h @@ -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
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 80b9a5a..21e4b01 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 diff --git a/include/configs/omap3_common.h b/include/configs/omap3_common.h new file mode 100644 index 0000000..417dec0 --- /dev/null +++ b/include/configs/omap3_common.h @@ -0,0 +1,40 @@ +/* + * (C) Copyright 2012 + * Texas Instruments Incorporated. + * Tom Rini trini@ti.com + * + * 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 */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 4173b53..3951f79 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -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 * ---------------------------------------------------------------------------- diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h index 4910dda..742faa1 100644 --- a/include/configs/omap3_evm_common.h +++ b/include/configs/omap3_evm_common.h @@ -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 */
diff --git a/include/configs/omap3_evm_quick_mmc.h b/include/configs/omap3_evm_quick_mmc.h index 912da7d..8590fac 100644 --- a/include/configs/omap3_evm_quick_mmc.h +++ b/include/configs/omap3_evm_quick_mmc.h @@ -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 * ----------------------------------------------------------------------------- diff --git a/include/configs/omap3_evm_quick_nand.h b/include/configs/omap3_evm_quick_nand.h index 362fa1d..ce19dad 100644 --- a/include/configs/omap3_evm_quick_nand.h +++ b/include/configs/omap3_evm_quick_nand.h @@ -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 * ----------------------------------------------------------------------------- diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 01360f6..03dc4ad 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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 diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index b819d21..cbe0862 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -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 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 64adc74..3db9c4d 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -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 diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 4df5f5d..41c9e8b 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -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 diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index 404aed2..fd1eeef 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -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
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 17608f5..a3e20c5 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -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 diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index b60ece3..5a1ff0a 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -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 diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 37eb87b..4ade3b6 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -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 diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index ba8847b..9b24ea9 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -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 diff --git a/include/configs/twister.h b/include/configs/twister.h index 64a886d..56944aa 100644 --- a/include/configs/twister.h +++ b/include/configs/twister.h @@ -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 */
I'm reading/replying to these one-by-one for sanity/clarity with regards to BeagleBoard...
-----Original Message----- From: Tom Rini trini@ti.com Date: Thu, 22 Mar 2012 12:09:07 -0700 To: u-boot@lists.denx.de Subject: [U-Boot] [RFC v0 01/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 trini@ti.com
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
...remove non-beagle patches for brevity...
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 80b9a5a..21e4b01 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 */
I can see it can make sense to have an OMAP/DM/AM3x target without SDRC enabled.
+/* 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
diff --git a/include/configs/omap3_common.h b/include/configs/omap3_common.h new file mode 100644 index 0000000..417dec0 --- /dev/null +++ b/include/configs/omap3_common.h @@ -0,0 +1,40 @@ +/*
- (C) Copyright 2012
- Texas Instruments Incorporated.
- Tom Rini trini@ti.com
- 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 */
... non-beagle stuff removed for brevity ...
I think this change looks rather useful and would have no negative impact.
On Thu, Mar 22, 2012 at 09:48:27PM -0400, Jason Kridner wrote:
I'm reading/replying to these one-by-one for sanity/clarity with regards to BeagleBoard...
[snip]
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 80b9a5a..21e4b01 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 */
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).
All boards define (and get generic functions for) these, move to omap3_common.h
Signed-off-by: Tom Rini trini@ti.com --- 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(-)
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index f58fede..8a1bb0a 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -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) diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index d24ad01..2a442c7 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -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) diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index fe214eb..1061564 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -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) diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index f1ece51..98eeb5e 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -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) diff --git a/include/configs/dig297.h b/include/configs/dig297.h index 5243b6a..3820ecb 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -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) diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h index 37284df..8e8082d 100644 --- a/include/configs/igep00x0.h +++ b/include/configs/igep00x0.h @@ -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) diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 6a6e0ec..0f3e427 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -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) diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 21e4b01..aab371e 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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) diff --git a/include/configs/omap3_common.h b/include/configs/omap3_common.h index 417dec0..cc8e146 100644 --- a/include/configs/omap3_common.h +++ b/include/configs/omap3_common.h @@ -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 */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 3951f79..65655bb 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -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
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 03dc4ad..d0b1af8 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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) diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index cbe0862..5c6a50f 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -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) diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 3db9c4d..c927bad 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -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) diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 41c9e8b..de20959 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -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) diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index fd1eeef..af76f8b 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -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) diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index a3e20c5..2ad20f3 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -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) diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index 5a1ff0a..87878d8 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -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) diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 4ade3b6..1de40c0 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -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) diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 9b24ea9..24f019c 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -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)
We provide the common values for these clocks here and allow boards to provide their own values if needed.
Signed-off-by: Tom Rini trini@ti.com --- 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(-)
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 8a1bb0a..7dc2eee 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -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
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 2a442c7..3a6daa4 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -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
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 1061564..6724527 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -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
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 98eeb5e..e6c9859 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -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
diff --git a/include/configs/dig297.h b/include/configs/dig297.h index 3820ecb..e0a518c 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -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
diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h index 8e8082d..c4feba2 100644 --- a/include/configs/igep00x0.h +++ b/include/configs/igep00x0.h @@ -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 */ diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 0f3e427..02793e5 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -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 */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index aab371e..a372646 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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
diff --git a/include/configs/omap3_common.h b/include/configs/omap3_common.h index cc8e146..f54aff1 100644 --- a/include/configs/omap3_common.h +++ b/include/configs/omap3_common.h @@ -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 */ diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h index 742faa1..0b4dcf1 100644 --- a/include/configs/omap3_evm_common.h +++ b/include/configs/omap3_evm_common.h @@ -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. diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index d0b1af8..6d245db 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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 */ diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index 5c6a50f..8465577 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -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
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index c927bad..661fb22 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -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
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index de20959..c5dc8b5 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -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
diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index af76f8b..faf8a6f 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -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
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 2ad20f3..9367849 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -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
diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index 87878d8..6d46ab7 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -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
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 1de40c0..057f173 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -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
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 24f019c..79de4f3 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -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
Move this common un-setting over to omap3_common.h
Signed-off-by: Tom Rini trini@ti.com --- 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(-)
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 7dc2eee..f113afc 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -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 */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 3a6daa4..51cab37 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -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 */ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 6724527..3a151fc 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -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 diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index e6c9859..972940f 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -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 */ diff --git a/include/configs/dig297.h b/include/configs/dig297.h index e0a518c..ca17d6e 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -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 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index a372646..eefada2 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 diff --git a/include/configs/omap3_common.h b/include/configs/omap3_common.h index f54aff1..e2c3a38 100644 --- a/include/configs/omap3_common.h +++ b/include/configs/omap3_common.h @@ -49,4 +49,7 @@ #define V_SCLK (V_OSCK >> 1) #endif
+/* no support for IRQs */ +#undef CONFIG_USE_IRQ + #endif /* __CONFIG_OMAP3_COMMON_H */ diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h index 0b4dcf1..c207693 100644 --- a/include/configs/omap3_evm_common.h +++ b/include/configs/omap3_evm_common.h @@ -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). diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 6d245db..6f327ad 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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 */ diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index 8465577..b179df2 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -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 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 661fb22..e3b803c 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -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 */ diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index c5dc8b5..048d983 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -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 */ diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index faf8a6f..4689ebd 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -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 */ diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 9367849..606e63f 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -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 */ diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index 6d46ab7..0a4c0ee 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -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 */ diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 057f173..3711859 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -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 */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 79de4f3..42b80cc 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -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 */
All platforms have at least a minimal function to print the dieid
Signed-off-by: Tom Rini trini@ti.com --- 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(-)
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index f113afc..d150b98 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -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 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 51cab37..26436f8 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -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 diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 3a151fc..87efb69 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -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 diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 972940f..9cc80d6 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -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 diff --git a/include/configs/dig297.h b/include/configs/dig297.h index ca17d6e..d1f7ca0 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -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 diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h index c4feba2..1d8ddbf 100644 --- a/include/configs/igep00x0.h +++ b/include/configs/igep00x0.h @@ -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 diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 02793e5..13cf6c0 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -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 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index eefada2..98d528a 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 */ diff --git a/include/configs/omap3_common.h b/include/configs/omap3_common.h index e2c3a38..9130ebe 100644 --- a/include/configs/omap3_common.h +++ b/include/configs/omap3_common.h @@ -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 */ diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h index c207693..f24c9b9 100644 --- a/include/configs/omap3_evm_common.h +++ b/include/configs/omap3_evm_common.h @@ -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 diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 6f327ad..5443a0f 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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 diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index b179df2..b44ea31 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -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 */ diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index e3b803c..d9a695a 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -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 diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 048d983..3887d63 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -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 diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index 4689ebd..6a17e11 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -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 diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 606e63f..6001a0c 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -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 diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index 0a4c0ee..5680a14 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -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 diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 3711859..2f75273 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -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 diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 42b80cc..e185b0c 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -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
Consolidate 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 trini@ti.com --- 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(-)
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index d150b98..d0b5cc0 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -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 */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 26436f8..da6a000 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -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 */ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 87efb69..9330442 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -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 */ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 9cc80d6..b792b40 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -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 */ diff --git a/include/configs/dig297.h b/include/configs/dig297.h index d1f7ca0..41b3e7c 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -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 */ diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h index 1d8ddbf..770a471 100644 --- a/include/configs/igep00x0.h +++ b/include/configs/igep00x0.h @@ -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 */ diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 13cf6c0..6c306bc 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -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 */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 98d528a..06f1a66 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 */ diff --git a/include/configs/omap3_common.h b/include/configs/omap3_common.h index 9130ebe..cc0f5fb 100644 --- a/include/configs/omap3_common.h +++ b/include/configs/omap3_common.h @@ -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 */ diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h index f24c9b9..af1e5dc 100644 --- a/include/configs/omap3_evm_common.h +++ b/include/configs/omap3_evm_common.h @@ -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
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 5443a0f..0e698c3 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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 */
diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index b44ea31..2ff57cd 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -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 */ diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index d9a695a..a19e22d 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -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 */ diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 3887d63..0ee91bb 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -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 */ diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index 6a17e11..b70e9b9 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -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 diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 6001a0c..56585fb 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -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 */ diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index 5680a14..e199b7a 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -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 */ diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 2f75273..fb0833c 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -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 diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index e185b0c..5d7d189 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -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 */
We 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 trini@ti.com --- 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(-)
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index d0b5cc0..ab776a7 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -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) diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index da6a000..7b8ba00 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -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) diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 9330442..0ead8b7 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -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 */
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index b792b40..13136ea 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -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 diff --git a/include/configs/dig297.h b/include/configs/dig297.h index 41b3e7c..1923809 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -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 */
diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h index 770a471..00c38b4 100644 --- a/include/configs/igep00x0.h +++ b/include/configs/igep00x0.h @@ -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) diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 6c306bc..83783c9 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -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) diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 06f1a66..86dabb7 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 */
diff --git a/include/configs/omap3_common.h b/include/configs/omap3_common.h index cc0f5fb..1190ce8 100644 --- a/include/configs/omap3_common.h +++ b/include/configs/omap3_common.h @@ -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 + * at 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 */ diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h index af1e5dc..d7fdd44 100644 --- a/include/configs/omap3_evm_common.h +++ b/include/configs/omap3_evm_common.h @@ -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 diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 0e698c3..77681e9 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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 */
diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index 2ff57cd..56ed3a1 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -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 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index a19e22d..fdb3bba 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -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 */
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 0ee91bb..d9f4f27 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -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 */
diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index b70e9b9..4656690 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -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 diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 56585fb..90f37af 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -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 */
diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index e199b7a..c563c5b 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -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 */
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index fb0833c..f2edbf1 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -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 */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 5d7d189..1bd8b5c 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -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 */
Unless 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 trini@ti.com --- 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(-)
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index ab776a7..0c46af4 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -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 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 7b8ba00..639e865 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -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 diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 0ead8b7..9327524 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -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 diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 13136ea..af03dcf 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -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 \ diff --git a/include/configs/dig297.h b/include/configs/dig297.h index 1923809..808eab2 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -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 diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h index 00c38b4..7e955f2 100644 --- a/include/configs/igep00x0.h +++ b/include/configs/igep00x0.h @@ -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 diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 83783c9..5dda673 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -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 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 86dabb7..298b22b 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 diff --git a/include/configs/omap3_common.h b/include/configs/omap3_common.h index 1190ce8..82ecce8 100644 --- a/include/configs/omap3_common.h +++ b/include/configs/omap3_common.h @@ -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 */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 65655bb..eba20b4 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -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
diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h index d7fdd44..8ee5e83 100644 --- a/include/configs/omap3_evm_common.h +++ b/include/configs/omap3_evm_common.h @@ -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 diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 77681e9..61c3646 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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 diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index 56ed3a1..c980dc3 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -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 \ diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index fdb3bba..a794b2c 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -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 diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index d9f4f27..6191b76 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -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 diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index 4656690..87e3460 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -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 at site. */
-/* allow overwriting serial config and ethaddr */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x82000000\0" \ "console=ttyS0,115200n8\0" \ diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 90f37af..e8927a1 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -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 diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index c563c5b..fa895d5 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -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 diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index f2edbf1..d2ffc29 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -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 diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 1bd8b5c..ee60b13 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -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 \
On Thursday 22 March 2012 15:09:14 Tom Rini wrote:
Unless 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.
not a big deal, but it seems like the env settings slipped in after the fact
--- a/include/configs/omap3_common.h +++ b/include/configs/omap3_common.h
+/*
- 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. -mike
On Tue, Apr 03, 2012 at 05:35:25PM -0400, Mike Frysinger wrote:
On Thursday 22 March 2012 15:09:14 Tom Rini wrote:
Unless 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.
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.
--- a/include/configs/omap3_common.h +++ b/include/configs/omap3_common.h
+/*
- 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.
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.
On Tuesday 03 April 2012 19:45:11 Tom Rini wrote:
On Tue, Apr 03, 2012 at 05:35:25PM -0400, Mike Frysinger wrote:
On Thursday 22 March 2012 15:09:14 Tom Rini wrote:
--- a/include/configs/omap3_common.h +++ b/include/configs/omap3_common.h
+/*
- 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.
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.
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 ...
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.
would make sense to me, although i'd cut out 4800 from the default list -mike
On Tue, Apr 03, 2012 at 10:42:38PM -0400, Mike Frysinger wrote:
On Tuesday 03 April 2012 19:45:11 Tom Rini wrote:
On Tue, Apr 03, 2012 at 05:35:25PM -0400, Mike Frysinger wrote:
On Thursday 22 March 2012 15:09:14 Tom Rini wrote:
--- a/include/configs/omap3_common.h +++ b/include/configs/omap3_common.h
+/*
- 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.
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.
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 ...
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.
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.
would make sense to me, although i'd cut out 4800 from the default list
Agreed.
Signed-off-by: Tom Rini trini@ti.com --- 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(-)
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 0c46af4..d607c67 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -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 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 639e865..eec85ce 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -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 diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 9327524..f543e93 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -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 diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index af03dcf..68f0b00 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -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 diff --git a/include/configs/dig297.h b/include/configs/dig297.h index 808eab2..44a522a 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -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 diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h index 7e955f2..c4c0fb0 100644 --- a/include/configs/igep00x0.h +++ b/include/configs/igep00x0.h @@ -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 diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 5dda673..9f95958 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -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 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 298b22b..0857666 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 diff --git a/include/configs/omap3_common.h b/include/configs/omap3_common.h index 82ecce8..023dc53 100644 --- a/include/configs/omap3_common.h +++ b/include/configs/omap3_common.h @@ -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 */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index eba20b4..fb675ce 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -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 * diff --git a/include/configs/omap3_evm_quick_mmc.h b/include/configs/omap3_evm_quick_mmc.h index 8590fac..9beab16 100644 --- a/include/configs/omap3_evm_quick_mmc.h +++ b/include/configs/omap3_evm_quick_mmc.h @@ -47,12 +47,6 @@ * ---------------------------------------------------------------------------- */
-/* MMC */ -#define CONFIG_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_OMAP_HSMMC -#define CONFIG_DOS_PARTITION - /* ----------------------------------------------------------------------------- * Include common board configuration * ----------------------------------------------------------------------------- diff --git a/include/configs/omap3_evm_quick_nand.h b/include/configs/omap3_evm_quick_nand.h index ce19dad..1dc46ab 100644 --- a/include/configs/omap3_evm_quick_nand.h +++ b/include/configs/omap3_evm_quick_nand.h @@ -25,6 +25,7 @@ * ---------------------------------------------------------------------------- */ #define CONFIG_CMD_NAND +#undef CONFIG_CMD_MMC
/* * Board revision is detected by probing the Ethernet chip. diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 61c3646..db5b7b1 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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>
diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index c980dc3..d9e4b53 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -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 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index a794b2c..1cfc333 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -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>
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 6191b76..e364253 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -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>
diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index 87e3460..2434d93 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -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 *---------------------------------------------------------------------------- diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index e8927a1..3121d67 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -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 diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index fa895d5..2a8f88c 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -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 diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index d2ffc29..0a53f7f 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -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 diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index ee60b13..787a9a6 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -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
Add 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 trini@ti.com --- 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(-)
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index d607c67..6b681e5 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -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 */
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index eec85ce..6137730 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -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 */
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index f543e93..14c443c 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -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" diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 68f0b00..91d976f 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -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 */ diff --git a/include/configs/dig297.h b/include/configs/dig297.h index 44a522a..792dff7 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -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 diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h index c4c0fb0..d7136ef 100644 --- a/include/configs/igep00x0.h +++ b/include/configs/igep00x0.h @@ -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
/* diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 9f95958..9d3b443 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -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 */
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 0857666..ec1856d 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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" diff --git a/include/configs/omap3_common.h b/include/configs/omap3_common.h index 023dc53..6fc93b8 100644 --- a/include/configs/omap3_common.h +++ b/include/configs/omap3_common.h @@ -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 */ diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h index 8ee5e83..c96a881 100644 --- a/include/configs/omap3_evm_common.h +++ b/include/configs/omap3_evm_common.h @@ -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 diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index db5b7b1..e9415a7 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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 diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index d9e4b53..6199eca 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -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 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 1cfc333..71bb1a3 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -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" diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index e364253..7b22c83 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -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 diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index 2434d93..b082f30 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -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 */ diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 3121d67..13ef802 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -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" diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index 2a8f88c..806854b 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -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
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 0a53f7f..392b660 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -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 */
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 787a9a6..41e1aae 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -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 */
We 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 trini@ti.com --- 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(-)
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 6b681e5..48579ce 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -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 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 6137730..bd58bad 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -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 diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 14c443c..c2c5af6 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -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
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 91d976f..bc51e53 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -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 diff --git a/include/configs/dig297.h b/include/configs/dig297.h index 792dff7..7708d2c 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -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 diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h index d7136ef..d6eff96 100644 --- a/include/configs/igep00x0.h +++ b/include/configs/igep00x0.h @@ -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 diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 9d3b443..12e7280 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -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 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index ec1856d..05b051a 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 */
/* diff --git a/include/configs/omap3_common.h b/include/configs/omap3_common.h index 6fc93b8..0ae1614 100644 --- a/include/configs/omap3_common.h +++ b/include/configs/omap3_common.h @@ -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) diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h index c96a881..7a47bc4 100644 --- a/include/configs/omap3_evm_common.h +++ b/include/configs/omap3_evm_common.h @@ -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 diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index e9415a7..d50c6f1 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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 diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index 6199eca..c29c99d 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -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 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 71bb1a3..c2a4cbe 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -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 diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 7b22c83..84292e4 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -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 diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index b082f30..6d73887 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -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 */
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 13ef802..93fbd39 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -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 diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index 806854b..fe71a16 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -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 diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 392b660..f5d2f5e 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -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
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 41e1aae..b3cd6a0 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -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
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.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.
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
On Tue, Apr 03, 2012 at 05:37:37PM -0400, Mike Frysinger wrote:
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.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.
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.
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/.
That's a good idea, I think. I'll give that a spin and see how it looks.
On Tuesday 03 April 2012 19:35:05 Tom Rini wrote:
On Tue, Apr 03, 2012 at 05:37:37PM -0400, Mike Frysinger wrote:
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.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.
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.
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/.
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
participants (3)
-
Jason Kridner -
Mike Frysinger -
Tom Rini