Change the configured serial console index to reflect that it is the first physical UART, reorder some defconfig lines and move some environment configuration from bcmstb.h to bcm7445.h.
Signed-off-by: Thomas Fitzsimmons <[email protected]> Cc: Florian Fainelli <[email protected]> --- Changes for v2: - Rebase to master tip - Change serial console index - Reorder defconfig lines - Move some environment configuration to bcm7445.h configs/bcm7445_defconfig | 8 ++++---- include/configs/bcm7445.h | 9 +++++++-- include/configs/bcmstb.h | 4 ---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig index 59c745f..cb15226 100644 --- a/configs/bcm7445_defconfig +++ b/configs/bcm7445_defconfig @@ -12,10 +12,10 @@ CONFIG_OF_PRIOR_STAGE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_BCMSTB=y -CONFIG_DM_SPI_FLASH=y -CONFIG_SPI_FLASH=y -CONFIG_CONS_INDEX=3 +CONFIG_CONS_INDEX=1 +CONFIG_EFI_LOADER=n CONFIG_SPI=y +CONFIG_SPI_FLASH=y CONFIG_DM_SPI=y +CONFIG_DM_SPI_FLASH=y CONFIG_BCMSTB_SPI=y -# CONFIG_EFI_LOADER is not set diff --git a/include/configs/bcm7445.h b/include/configs/bcm7445.h index f34cf2d..8c675f7 100644 --- a/include/configs/bcm7445.h +++ b/include/configs/bcm7445.h @@ -10,7 +10,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_SYS_NS16550_COM3 0xf040ab00 +#define CONFIG_SYS_NS16550_COM1 0xf040ab00 #define CONFIG_SYS_TEXT_BASE 0x80100000 #define CONFIG_SYS_INIT_RAM_ADDR 0x80200000 @@ -28,7 +28,12 @@ #define BCMSTB_HIF_SPI_INTR2 0xf03e1a00 #define BCMSTB_CS_REG 0xf03e0920 -#define CONFIG_ENV_IS_IN_SPI_FLASH 1 +/* + * Environment configuration for SPI flash. + */ +#define CONFIG_ENV_OFFSET 0x1e0000 +#define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE + #define CONFIG_DM_SPI 1 #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_CMD_SF diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index e755383..cc28924 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -114,7 +114,6 @@ extern phys_addr_t prior_stage_fdt_address; /* * Serial console configuration. */ - #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \ 115200} @@ -151,10 +150,7 @@ extern phys_addr_t prior_stage_fdt_address; * Environment configuration. */ #define CONFIG_SYS_REDUNDAND_ENVIRONMENT - -#define CONFIG_ENV_OFFSET 0x1e0000 #define CONFIG_ENV_SIZE (64 << 10) /* 64 KiB */ -#define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #define CONFIG_ENV_OVERWRITE -- 1.8.3.1 _______________________________________________ U-Boot mailing list [email protected] https://lists.denx.de/listinfo/u-boot
