projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v2021.10-rc5' into next
[platform/kernel/u-boot.git]
/
include
/
configs
/
bcmstb.h
diff --git
a/include/configs/bcmstb.h
b/include/configs/bcmstb.h
index
5f6bf62
..
c3c28ea
100644
(file)
--- a/
include/configs/bcmstb.h
+++ b/
include/configs/bcmstb.h
@@
-10,7
+10,6
@@
#ifndef __BCMSTB_H
#define __BCMSTB_H
#ifndef __BCMSTB_H
#define __BCMSTB_H
-#include "version.h"
#include <linux/sizes.h>
#ifndef __ASSEMBLY__
#include <linux/sizes.h>
#ifndef __ASSEMBLY__
@@
-36,7
+35,6
@@
extern phys_addr_t prior_stage_fdt_address;
/*
* CPU configuration.
*/
/*
* CPU configuration.
*/
-#define CONFIG_SKIP_LOWLEVEL_INIT
/*
* Memory configuration.
/*
* Memory configuration.
@@
-88,7
+86,6
@@
extern phys_addr_t prior_stage_fdt_address;
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \
CONFIG_SYS_INIT_RAM_SIZE - \
GENERATED_GBL_DATA_SIZE)
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \
CONFIG_SYS_INIT_RAM_SIZE - \
GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_LOAD_ADDR 0x2000000
/*
* CONFIG_SYS_LOAD_ADDR - 1 MiB.
/*
* CONFIG_SYS_LOAD_ADDR - 1 MiB.
@@
-115,26
+112,20
@@
extern phys_addr_t prior_stage_fdt_address;
/*
* Serial console configuration.
*/
/*
* Serial console configuration.
*/
-#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \
115200}
/*
* Informational display configuration.
*/
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \
115200}
/*
* Informational display configuration.
*/
-#define CONFIG_REVISION_TAG
/*
* Command configuration.
*/
/*
* Command configuration.
*/
-#define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_EXT2
/*
* Flash configuration.
*/
/*
* Flash configuration.
*/
-#define CONFIG_ST_SMI
#define CONFIG_SPI_FLASH_STMICRO
#define CONFIG_SPI_FLASH_MACRONIX
#define CONFIG_SPI_FLASH_STMICRO
#define CONFIG_SPI_FLASH_MACRONIX
@@
-142,14
+133,10
@@
extern phys_addr_t prior_stage_fdt_address;
* Filesystem configuration.
*/
#define CONFIG_DOS_PARTITION
* Filesystem configuration.
*/
#define CONFIG_DOS_PARTITION
-#define CONFIG_CMD_EXT4
-#define CONFIG_FS_EXT4
-#define CONFIG_CMD_FS_GENERIC
/*
* Environment configuration.
*/
/*
* Environment configuration.
*/
-#define CONFIG_ENV_OVERWRITE
/*
* Save the prior stage provided DTB.
/*
* Save the prior stage provided DTB.
@@
-166,6
+153,5
@@
extern phys_addr_t prior_stage_fdt_address;
* Set fdtaddr to prior stage-provided DTB in board_late_init, when
* writeable environment is available.
*/
* Set fdtaddr to prior stage-provided DTB in board_late_init, when
* writeable environment is available.
*/
-#define CONFIG_BOARD_LATE_INIT
#endif /* __BCMSTB_H */
#endif /* __BCMSTB_H */