diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-29 22:03:00 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-29 22:03:00 +0200 |
| commit | 0c0892be0d93a5a892b93739c5eb3bf692fed4ff (patch) | |
| tree | a046b11024bdf0a41082647c95df23a10cb206fc /include/configs/mv-common.h | |
| parent | d75c2a3d7f34ff1eb9920ad72483cff7cb6d358f (diff) | |
| parent | 28e57108a61bd0e554d9847170b8ad9dad093e07 (diff) | |
| download | bootable_bootloader_goldelico_gta04-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.zip bootable_bootloader_goldelico_gta04-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.tar.gz bootable_bootloader_goldelico_gta04-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-marvell
Conflicts:
include/configs/km_arm.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/mv-common.h')
| -rw-r--r-- | include/configs/mv-common.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index bc81f2d..de0121e 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -45,6 +45,22 @@ #define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */ #define CONFIG_KIRKWOOD_PCIE_INIT /* Enable PCIE Port0 for kernel */ +/* + * By default kwbimage.cfg from board specific folder is used + * If for some board, different configuration file need to be used, + * CONFIG_SYS_KWD_CONFIG should be defined in board specific header file + */ +#ifndef CONFIG_SYS_KWD_CONFIG +#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.cfg +#endif /* CONFIG_SYS_KWD_CONFIG */ + +/* + * CONFIG_SYS_TEXT_BASE can be defined in board specific header file, if needed + */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0x00600000 +#endif /* CONFIG_SYS_TEXT_BASE */ + #define CONFIG_I2C_MVTWSI_BASE KW_TWSI_BASE #define MV_UART0_BASE KW_UART0_BASE #define MV_SATA_BASE KW_SATA_BASE @@ -141,6 +157,7 @@ #define CONFIG_CONSOLE_INFO_QUIET /* some code reduction */ #define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */ #define CONFIG_ARCH_MISC_INIT /* call arch_misc_init() */ +#define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits */ #define CONFIG_DISPLAY_CPUINFO /* Display cpu info */ #define CONFIG_NR_DRAM_BANKS 4 #define CONFIG_STACKSIZE 0x00100000 /* regular stack- 1M */ |