diff options
| author | Prafulla Wadaskar <prafulla@marvell.com> | 2010-10-27 17:46:06 +0530 |
|---|---|---|
| committer | Prafulla Wadaskar <prafulla@marvell.com> | 2010-10-28 19:12:06 +0530 |
| commit | 31d80c77ff672e0202b4ada5215c4666c949ffc2 (patch) | |
| tree | 4bdac717023c5bbef1c8ce854f6cd38d5246e2be /include/configs | |
| parent | 5842383e25910636d2e9a722f0ef1a2ec7951b36 (diff) | |
| download | u-boot-imx-31d80c77ff672e0202b4ada5215c4666c949ffc2.zip u-boot-imx-31d80c77ff672e0202b4ada5215c4666c949ffc2.tar.gz u-boot-imx-31d80c77ff672e0202b4ada5215c4666c949ffc2.tar.bz2 | |
kirkwood: get rid of config.mk files
After moving the definition of CONFIG_SYS_TEXT_BASE to the respective
board config files, all Marvell kirkwood board have just a single and
common entry in their config.mk files:
KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg
Replace the only reference to KWD_CONFIG in the top level Makefile by
an equivalent setting, and remove all kirkwood config.mk files.
Signed-off-by: Wolfgang Denk <wd at denx.de>
Cc: Prafulla Wadaskar <prafulla at marvell.com>
Cc: Siddarth Gore <gores at marvell.com>
Cc: Simon Kagstrom <simon.kagstrom at netinsight.net>
Cc: Heiko Schocher <hs at denx.de>
Cc: Eric Cooper <ecc at cmu.edu>
Acked-by: Wolfgang Denk <wd at denx.de>
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/keymile-common.h | 16 | ||||
| -rw-r--r-- | include/configs/mv-common.h | 16 |
2 files changed, 32 insertions, 0 deletions
diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h index 62d21f6..ccc71c9 100644 --- a/include/configs/keymile-common.h +++ b/include/configs/keymile-common.h @@ -30,6 +30,22 @@ #define CONFIG_BOOTCOUNT_LIMIT /* + * 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 0x00400000 +#endif /* CONFIG_SYS_TEXT_BASE */ + +/* * Command line configuration. */ #include <config_cmd_default.h> diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 2b19a34..e4a8148 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 |