mirror of
https://github.com/u-boot/u-boot.git
synced 2024-11-26 21:54:37 +08:00
integrator: break out common config
The configuration that is common for all Integrator boards may just as well be stored in a common include file as per pattern from other boards. This eases maintenance quite a bit. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij
Tom Rini
parent
a9f1a48933
commit
e62b008fe3
103
include/configs/integrator-common.h
Normal file
103
include/configs/integrator-common.h
Normal file
@ -0,0 +1,103 @@
|
||||
/*
|
||||
* (C) Copyright 2012
|
||||
* Linaro
|
||||
* Linus Walleij <linus.walleij@linaro.org>
|
||||
* Common ARM Integrator 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
|
||||
*/
|
||||
|
||||
#define CONFIG_INTEGRATOR
|
||||
|
||||
#define CONFIG_SYS_TEXT_BASE 0x01000000
|
||||
#define CONFIG_SYS_MEMTEST_START 0x100000
|
||||
#define CONFIG_SYS_MEMTEST_END 0x10000000
|
||||
#define CONFIG_SYS_HZ 1000
|
||||
#define CONFIG_SYS_TIMERBASE 0x13000100 /* Timer1 */
|
||||
#define CONFIG_SYS_LOAD_ADDR 0x7fc0 /* default load address */
|
||||
#define CONFIG_SYS_LONGHELP
|
||||
#define CONFIG_SYS_HUSH_PARSER
|
||||
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size*/
|
||||
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
|
||||
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
|
||||
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size*/
|
||||
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* Size of malloc() pool */
|
||||
|
||||
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
|
||||
#define CONFIG_SETUP_MEMORY_TAGS
|
||||
#define CONFIG_MISC_INIT_R /* call misc_init_r during start up */
|
||||
|
||||
/*
|
||||
* There are various dependencies on the core module (CM) fitted
|
||||
* Users should refer to their CM user guide
|
||||
*/
|
||||
#include "armcoremodule.h"
|
||||
|
||||
/*
|
||||
* Initialize and remap the core module, use SPD to detect memory size
|
||||
* If CONFIG_SKIP_LOWLEVEL_INIT is not defined &
|
||||
* the core module has a CM_INIT register
|
||||
* then the U-Boot initialisation code will
|
||||
* e.g. ARM Boot Monitor or pre-loader is repeated once
|
||||
* (to re-initialise any existing CM_INIT settings to safe values).
|
||||
*
|
||||
* This is usually not the desired behaviour since the platform
|
||||
* will either reboot into the ARM monitor (or pre-loader)
|
||||
* or continuously cycle thru it without U-Boot running,
|
||||
* depending upon the setting of Integrator/CP switch S2-4.
|
||||
*
|
||||
* However it may be needed if Integrator/CP switch S2-1
|
||||
* is set OFF to boot direct into U-Boot.
|
||||
* In that case comment out the line below.
|
||||
*/
|
||||
#define CONFIG_CM_INIT
|
||||
#define CONFIG_CM_REMAP
|
||||
#define CONFIG_CM_SPD_DETECT
|
||||
|
||||
/*
|
||||
* The ARM boot monitor initializes the board.
|
||||
* However, the default U-Boot code also performs the initialization.
|
||||
* If desired, this can be prevented by defining SKIP_LOWLEVEL_INIT
|
||||
* - see documentation supplied with board for details of how to choose the
|
||||
* image to run at reset/power up
|
||||
* e.g. whether the ARM Boot Monitor runs before U-Boot
|
||||
*/
|
||||
/* #define CONFIG_SKIP_LOWLEVEL_INIT */
|
||||
|
||||
/*
|
||||
* The ARM boot monitor does not relocate U-Boot.
|
||||
* However, the default U-Boot code performs the relocation check,
|
||||
* and may relocate the code if the memory map is changed.
|
||||
* If necessary this can be prevented by defining SKIP_RELOCATE_UBOOT
|
||||
*/
|
||||
/* #define SKIP_CONFIG_RELOCATE_UBOOT */
|
||||
|
||||
|
||||
/*
|
||||
* Physical Memory Map
|
||||
*/
|
||||
#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */
|
||||
#define PHYS_SDRAM_1 0x00000000 /* SDRAM Bank #1 */
|
||||
#define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */
|
||||
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
||||
#define CONFIG_SYS_INIT_RAM_SIZE PHYS_SDRAM_1_SIZE
|
||||
#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_SDRAM_BASE + \
|
||||
CONFIG_SYS_INIT_RAM_SIZE - \
|
||||
GENERATED_GBL_DATA_SIZE)
|
||||
#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET
|
||||
@ -31,32 +31,11 @@
|
||||
#ifndef __CONFIG_H
|
||||
#define __CONFIG_H
|
||||
|
||||
#define CONFIG_INTEGRATOR
|
||||
#include "integrator-common.h"
|
||||
|
||||
/* Integrator/AP-specific configuration */
|
||||
#define CONFIG_ARCH_INTEGRATOR
|
||||
/*
|
||||
* High Level Configuration Options
|
||||
* (easy to change)
|
||||
*/
|
||||
#define CONFIG_SYS_TEXT_BASE 0x01000000
|
||||
#define CONFIG_SYS_MEMTEST_START 0x100000
|
||||
#define CONFIG_SYS_MEMTEST_END 0x10000000
|
||||
#define CONFIG_SYS_HZ 1000
|
||||
#define CONFIG_SYS_HZ_CLOCK 24000000 /* Timer 1 is clocked at 24Mhz */
|
||||
#define CONFIG_SYS_TIMERBASE 0x13000100 /* Timer1 */
|
||||
|
||||
#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
|
||||
#define CONFIG_SETUP_MEMORY_TAGS 1
|
||||
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r during start up */
|
||||
|
||||
#define CONFIG_SKIP_LOWLEVEL_INIT
|
||||
#define CONFIG_CM_INIT 1
|
||||
#define CONFIG_CM_REMAP 1
|
||||
#define CONFIG_CM_SPD_DETECT
|
||||
|
||||
/*
|
||||
* Size of malloc() pool
|
||||
*/
|
||||
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
|
||||
|
||||
/*
|
||||
* PL010 Configuration
|
||||
@ -90,29 +69,7 @@
|
||||
/*
|
||||
* Miscellaneous configurable options
|
||||
*/
|
||||
#define CONFIG_SYS_LONGHELP /* undef to save memory */
|
||||
#define CONFIG_SYS_HUSH_PARSER
|
||||
#define CONFIG_SYS_PROMPT "Integrator-AP # " /* Monitor Command Prompt */
|
||||
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
|
||||
/* Print Buffer Size */
|
||||
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
|
||||
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
|
||||
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
|
||||
|
||||
#define CONFIG_SYS_LOAD_ADDR 0x7fc0 /* default load address */
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* Physical Memory Map
|
||||
*/
|
||||
#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */
|
||||
#define PHYS_SDRAM_1 0x00000000 /* SDRAM Bank #1 */
|
||||
#define PHYS_SDRAM_1_SIZE 0x02000000 /* 32 MB */
|
||||
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
||||
#define CONFIG_SYS_INIT_RAM_SIZE PHYS_SDRAM_1_SIZE
|
||||
#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_SDRAM_BASE + \
|
||||
CONFIG_SYS_INIT_RAM_SIZE - \
|
||||
GENERATED_GBL_DATA_SIZE)
|
||||
#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET
|
||||
|
||||
#define CONFIG_SYS_FLASH_BASE 0x24000000
|
||||
|
||||
|
||||
@ -31,32 +31,11 @@
|
||||
#ifndef __CONFIG_H
|
||||
#define __CONFIG_H
|
||||
|
||||
/* Integrator-specific configuration */
|
||||
#define CONFIG_INTEGRATOR
|
||||
#include "integrator-common.h"
|
||||
|
||||
/* Integrator CP-specific configuration */
|
||||
#define CONFIG_ARCH_CINTEGRATOR
|
||||
#define CONFIG_CM_INIT
|
||||
#define CONFIG_CM_REMAP
|
||||
#define CONFIG_CM_SPD_DETECT
|
||||
|
||||
/*
|
||||
* High Level Configuration Options
|
||||
* (easy to change)
|
||||
*/
|
||||
#define CONFIG_SYS_TEXT_BASE 0x01000000
|
||||
#define CONFIG_SYS_MEMTEST_START 0x100000
|
||||
#define CONFIG_SYS_MEMTEST_END 0x10000000
|
||||
#define CONFIG_SYS_HZ 1000
|
||||
#define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer 1 is clocked at 1Mhz */
|
||||
#define CONFIG_SYS_TIMERBASE 0x13000100
|
||||
|
||||
#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
|
||||
#define CONFIG_SETUP_MEMORY_TAGS 1
|
||||
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r during start up */
|
||||
|
||||
/*
|
||||
* Size of malloc() pool
|
||||
*/
|
||||
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
|
||||
|
||||
/*
|
||||
* Hardware drivers
|
||||
@ -66,9 +45,7 @@
|
||||
#define CONFIG_SMC91111_BASE 0xC8000000
|
||||
#undef CONFIG_SMC91111_EXT_PHY
|
||||
|
||||
/*
|
||||
* NS16550 Configuration
|
||||
*/
|
||||
/* PL011 configuration */
|
||||
#define CONFIG_PL011_SERIAL
|
||||
#define CONFIG_PL011_CLOCK 14745600
|
||||
#define CONFIG_PL01x_PORTS { (void *)CONFIG_SYS_SERIAL0, (void *)CONFIG_SYS_SERIAL1 }
|
||||
@ -77,16 +54,6 @@
|
||||
#define CONFIG_SYS_SERIAL0 0x16000000
|
||||
#define CONFIG_SYS_SERIAL1 0x17000000
|
||||
|
||||
|
||||
/*
|
||||
* BOOTP options
|
||||
*/
|
||||
#define CONFIG_BOOTP_BOOTFILESIZE
|
||||
#define CONFIG_BOOTP_BOOTPATH
|
||||
#define CONFIG_BOOTP_GATEWAY
|
||||
#define CONFIG_BOOTP_HOSTNAME
|
||||
|
||||
|
||||
/*
|
||||
* Command line configuration.
|
||||
*/
|
||||
@ -102,32 +69,10 @@
|
||||
/*
|
||||
* Miscellaneous configurable options
|
||||
*/
|
||||
#define CONFIG_SYS_LONGHELP /* undef to save memory */
|
||||
#define CONFIG_SYS_PROMPT "Integrator-CP # " /* Monitor Command Prompt */
|
||||
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size*/
|
||||
/* Print Buffer Size */
|
||||
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
|
||||
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
|
||||
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size*/
|
||||
|
||||
#define CONFIG_SYS_LOAD_ADDR 0x7fc0 /* default load address */
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* Physical Memory Map
|
||||
*/
|
||||
#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */
|
||||
#define PHYS_SDRAM_1 0x00000000 /* SDRAM Bank #1 */
|
||||
#define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */
|
||||
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
||||
#define CONFIG_SYS_INIT_RAM_SIZE PHYS_SDRAM_1_SIZE
|
||||
#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_SDRAM_BASE + \
|
||||
CONFIG_SYS_INIT_RAM_SIZE - \
|
||||
GENERATED_GBL_DATA_SIZE)
|
||||
#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
/*
|
||||
* FLASH and environment organization
|
||||
|
||||
* Top varies according to amount fitted
|
||||
* Reserve top 4 blocks of flash
|
||||
* - ARM Boot Monitor
|
||||
@ -136,7 +81,6 @@
|
||||
* - U-Boot environment
|
||||
*
|
||||
* Base is always 0x24000000
|
||||
|
||||
*/
|
||||
#define CONFIG_SYS_FLASH_BASE 0x24000000
|
||||
#define CONFIG_SYS_FLASH_CFI 1
|
||||
@ -178,53 +122,4 @@
|
||||
#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256KB */
|
||||
#define CONFIG_ENV_SIZE 8192 /* 8KB */
|
||||
|
||||
/*
|
||||
* The ARM boot monitor initializes the board.
|
||||
* However, the default U-Boot code also performs the initialization.
|
||||
* If desired, this can be prevented by defining SKIP_LOWLEVEL_INIT
|
||||
* - see documentation supplied with board for details of how to choose the
|
||||
* image to run at reset/power up
|
||||
* e.g. whether the ARM Boot Monitor runs before U-Boot
|
||||
|
||||
#define CONFIG_SKIP_LOWLEVEL_INIT
|
||||
|
||||
*/
|
||||
|
||||
/*
|
||||
* The ARM boot monitor does not relocate U-Boot.
|
||||
* However, the default U-Boot code performs the relocation check,
|
||||
* and may relocate the code if the memory map is changed.
|
||||
* If necessary this can be prevented by defining SKIP_RELOCATE_UBOOT
|
||||
|
||||
#define SKIP_CONFIG_RELOCATE_UBOOT
|
||||
|
||||
*/
|
||||
/*-----------------------------------------------------------------------
|
||||
* There are various dependencies on the core module (CM) fitted
|
||||
* Users should refer to their CM user guide
|
||||
* - when porting adjust u-boot/Makefile accordingly
|
||||
* to define the necessary CONFIG_ s for the CM involved
|
||||
* see e.g. cp_926ejs_config
|
||||
*/
|
||||
|
||||
#include "armcoremodule.h"
|
||||
|
||||
/*
|
||||
* If CONFIG_SKIP_LOWLEVEL_INIT is not defined &
|
||||
* the core module has a CM_INIT register
|
||||
* then the U-Boot initialisation code will
|
||||
* e.g. ARM Boot Monitor or pre-loader is repeated once
|
||||
* (to re-initialise any existing CM_INIT settings to safe values).
|
||||
*
|
||||
* This is usually not the desired behaviour since the platform
|
||||
* will either reboot into the ARM monitor (or pre-loader)
|
||||
* or continuously cycle thru it without U-Boot running,
|
||||
* depending upon the setting of Integrator/CP switch S2-4.
|
||||
*
|
||||
* However it may be needed if Integrator/CP switch S2-1
|
||||
* is set OFF to boot direct into U-Boot.
|
||||
* In that case comment out the line below.
|
||||
#undef CONFIG_CM_INIT
|
||||
*/
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user