Move some configuration #defines that do not apply to other bcmstb boards from bcmstb.h to bcm7445.h.

Signed-off-by: Thomas Fitzsimmons fitzsim@fitzsim.org --- include/configs/bcm7445.h | 18 ++++++++++++++++-- include/configs/bcmstb.h | 13 ------------- 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/include/configs/bcm7445.h b/include/configs/bcm7445.h index f720035..4601adf 100644 --- a/include/configs/bcm7445.h +++ b/include/configs/bcm7445.h @@ -10,10 +10,17 @@ #ifndef __CONFIG_H #define __CONFIG_H

-#include "bcmstb.h" - #define CONFIG_SYS_NS16550_COM3 0xf040ab00

+#define CONFIG_NR_DRAM_BANKS 3 + +#define CONFIG_SYS_TEXT_BASE 0x80100000 +#define CONFIG_SYS_INIT_RAM_ADDR 0x80200000 + +#define CONFIG_SYS_MALLOC_LEN ((10 * 1024) << 10) /* 10 MiB */ + +#include "bcmstb.h" + #define BCMSTB_SDHCI_BASE 0xf03e0200 #define BCMSTB_TIMER_LOW 0xf0412008 #define BCMSTB_TIMER_HIGH 0xf041200c @@ -23,4 +30,11 @@ #define BCMSTB_HIF_SPI_INTR2 0xf03e1a00 #define BCMSTB_CS_REG 0xf03e0920

+#define CONFIG_ENV_IS_IN_SPI_FLASH 1 +#define CONFIG_DM_SPI 1 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_CMD_SF +#define CONFIG_CMD_SPI +#define CONFIG_CMD_SF_TEST + #endif /* __CONFIG_H */ diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index 262ef54..c74fe40 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -87,16 +87,11 @@ extern phys_addr_t prior_stage_fdt_address; * MiB. However, BOLT can be configured to allow loading larger * initramfs images, in which case this limitation is eliminated. */ -#define CONFIG_NR_DRAM_BANKS 3 - #define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_SYS_TEXT_BASE 0x80100000 -#define CONFIG_SYS_INIT_RAM_ADDR 0x80200000 #define CONFIG_SYS_INIT_RAM_SIZE 0x100000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - \ GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_MALLOC_LEN ((10 * 1024) << 10) /* 10 MiB */ #define CONFIG_SYS_LOAD_ADDR 0x2000000

/* @@ -141,9 +136,6 @@ extern phys_addr_t prior_stage_fdt_address; #define CONFIG_CMD_ASKENV #define CONFIG_CMD_CACHE #define CONFIG_CMD_EXT2 -#define CONFIG_CMD_SF -#define CONFIG_CMD_SPI -#define CONFIG_CMD_SF_TEST #define CONFIG_CMD_MMC

/* @@ -166,7 +158,6 @@ extern phys_addr_t prior_stage_fdt_address; */ #define CONFIG_SYS_REDUNDAND_ENVIRONMENT

-#define CONFIG_ENV_IS_IN_SPI_FLASH 1 #define CONFIG_ENV_OFFSET 0x1e0000 #define CONFIG_ENV_SIZE (64 << 10) /* 64 KiB */ #define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE @@ -194,8 +185,4 @@ extern phys_addr_t prior_stage_fdt_address; */ #define CONFIG_BOARD_LATE_INIT

-#define CONFIG_SYS_MAX_FLASH_BANKS 1 - -#define CONFIG_DM_SPI 1 - #endif /* __BCMSTB_H */