Merge tag 'next-20220328' of https://source.denx.de/u-boot/custodians/u-boot-video...

[platform/kernel/u-boot.git] / include / configs / bcmstb.h

diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h
index 7f1c298..98c8159 100644 (file)
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -10,7 +10,6 @@
 #ifndef __BCMSTB_H
 #define __BCMSTB_H
 
-#include "version.h"
 #include <linux/sizes.h>
 
 #ifndef __ASSEMBLY__
@@ -91,7 +90,6 @@ extern phys_addr_t prior_stage_fdt_address;
 /*
  * CONFIG_SYS_LOAD_ADDR - 1 MiB.
  */
-#define CONFIG_SYS_FDT_SAVE_ADDRESS    0x1f00000
 #define CONFIG_SYS_CBSIZE              512
 #define CONFIG_SYS_MAXARGS             32
 
@@ -105,7 +103,6 @@ extern phys_addr_t prior_stage_fdt_address;
  */
 #define V_NS16550_CLK                  81000000
 
-#define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #define CONFIG_SYS_NS16550_CLK         V_NS16550_CLK
@@ -127,14 +124,10 @@ extern phys_addr_t prior_stage_fdt_address;
 /*
  * Flash configuration.
  */
-#define CONFIG_ST_SMI
-#define CONFIG_SPI_FLASH_STMICRO
-#define CONFIG_SPI_FLASH_MACRONIX
 
 /*
  * Filesystem configuration.
  */
-#define CONFIG_DOS_PARTITION
 
 /*
  * Environment configuration.