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
global: Migrate CONFIG_STACKBASE to CFG
[platform/kernel/u-boot.git]
/
include
/
configs
/
vexpress_aemv8.h
diff --git
a/include/configs/vexpress_aemv8.h
b/include/configs/vexpress_aemv8.h
index
3705313
..
43f7e45
100644
(file)
--- a/
include/configs/vexpress_aemv8.h
+++ b/
include/configs/vexpress_aemv8.h
@@
-84,17
+84,11
@@
#endif
#endif /* !CONFIG_GICV3 */
#endif
#endif /* !CONFIG_GICV3 */
-#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) && !defined(CONFIG_DM_ETH)
-/* The Vexpress64 BASE_FVP simulator uses SMSC91C111 */
-#define CONFIG_SMC91111 1
-#define CONFIG_SMC91111_BASE (V2M_PA_BASE + 0x01A000000)
-#endif
-
/* PL011 Serial Configuration */
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
/* PL011 Serial Configuration */
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
-#define C
ONFIG_PL011_CLOCK
7372800
+#define C
FG_PL011_CLOCK
7372800
#else
#else
-#define C
ONFIG_PL011_CLOCK
24000000
+#define C
FG_PL011_CLOCK
24000000
#endif
/* Physical Memory Map */
#endif
/* Physical Memory Map */
@@
-102,7
+96,7
@@
/* Top 16MB reserved for secure world use */
#define DRAM_SEC_SIZE 0x01000000
#define PHYS_SDRAM_1_SIZE 0x80000000 - DRAM_SEC_SIZE
/* Top 16MB reserved for secure world use */
#define DRAM_SEC_SIZE 0x01000000
#define PHYS_SDRAM_1_SIZE 0x80000000 - DRAM_SEC_SIZE
-#define C
ONFIG_SYS_SDRAM_BASE
PHYS_SDRAM_1
+#define C
FG_SYS_SDRAM_BASE
PHYS_SDRAM_1
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
#define PHYS_SDRAM_2 (0x880000000)
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
#define PHYS_SDRAM_2 (0x880000000)
@@
-250,7
+244,7
@@
#include <config_distro_bootcmd.h>
/* Default load addresses and names for the different payloads. */
#include <config_distro_bootcmd.h>
/* Default load addresses and names for the different payloads. */
-#define C
ONFIG_EXTRA_ENV_SETTINGS
\
+#define C
FG_EXTRA_ENV_SETTINGS
\
"kernel_addr_r=" __stringify(VEXPRESS_KERNEL_ADDR) "\0" \
"ramdisk_addr_r=" __stringify(VEXPRESS_RAMDISK_ADDR) "\0" \
"pxefile_addr_r=" __stringify(VEXPRESS_PXEFILE_ADDR) "\0" \
"kernel_addr_r=" __stringify(VEXPRESS_KERNEL_ADDR) "\0" \
"ramdisk_addr_r=" __stringify(VEXPRESS_RAMDISK_ADDR) "\0" \
"pxefile_addr_r=" __stringify(VEXPRESS_PXEFILE_ADDR) "\0" \
@@
-260,19
+254,9
@@
BOOTENV
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
BOOTENV
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
-#define CONFIG_SYS_FLASH_BASE 0x08000000
-/* 255 x 256KiB sectors + 4 x 64KiB sectors at the end = 259 */
-#define CONFIG_SYS_MAX_FLASH_SECT 259
-/* Store environment at top of flash in the same location as blank.img */
-/* in the Juno firmware. */
+#define CFG_SYS_FLASH_BASE 0x08000000
#else
#else
-#define CONFIG_SYS_FLASH_BASE (V2M_PA_BASE + 0x0C000000)
-/* 256 x 256KiB sectors */
-#define CONFIG_SYS_MAX_FLASH_SECT 256
-/* Store environment at top of flash */
+#define CFG_SYS_FLASH_BASE (V2M_PA_BASE + 0x0C000000)
#endif
#endif
-#define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */
-#define FLASH_MAX_SECTOR_SIZE 0x00040000
-
#endif /* __VEXPRESS_AEMV8_H */
#endif /* __VEXPRESS_AEMV8_H */