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 'u-boot-nand-20230417' of https://source.denx.de/u-boot/custodians/u-boot...
[platform/kernel/u-boot.git]
/
include
/
configs
/
hikey.h
diff --git
a/include/configs/hikey.h
b/include/configs/hikey.h
index
29a0d94
..
36bf22b
100644
(file)
--- a/
include/configs/hikey.h
+++ b/
include/configs/hikey.h
@@
-13,34
+13,23
@@
#include <linux/sizes.h>
#include <linux/sizes.h>
-#define CONFIG_POWER_HI6553
-
-#define CONFIG_SYS_BOOTM_LEN SZ_64M
-
/* Physical Memory Map */
/* Physical Memory Map */
-/* CONFIG_
SYS_
TEXT_BASE needs to align with where ATF loads bl33.bin */
+/* CONFIG_TEXT_BASE needs to align with where ATF loads bl33.bin */
#define PHYS_SDRAM_1 0x00000000
/* 1008 MB (the last 16Mb are secured for TrustZone by ATF*/
#define PHYS_SDRAM_1_SIZE 0x3EFFFFFF
#define PHYS_SDRAM_1 0x00000000
/* 1008 MB (the last 16Mb are secured for TrustZone by ATF*/
#define PHYS_SDRAM_1_SIZE 0x3EFFFFFF
-#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
-
-#define CONFIG_SYS_INIT_RAM_SIZE 0x1000
+#define CFG_SYS_SDRAM_BASE PHYS_SDRAM_1
-#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0)
-
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY 19000000
+#define CFG_SYS_INIT_RAM_SIZE 0x1000
/* Generic Interrupt Controller Definitions */
#define GICD_BASE 0xf6801000
#define GICC_BASE 0xf6802000
/* Generic Interrupt Controller Definitions */
#define GICD_BASE 0xf6801000
#define GICC_BASE 0xf6802000
-#define CONFIG_HIKEY_GPIO
-
/* Initial environment variables */
/*
/* Initial environment variables */
/*
@@
-53,7
+42,7
@@
func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h>
func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h>
-#define C
ONFIG_EXTRA_ENV_SETTINGS
\
+#define C
FG_EXTRA_ENV_SETTINGS
\
"kernel_name=Image\0" \
"kernel_addr_r=0x00080000\0" \
"fdtfile=hi6220-hikey.dtb\0" \
"kernel_name=Image\0" \
"kernel_addr_r=0x00080000\0" \
"fdtfile=hi6220-hikey.dtb\0" \
@@
-64,8
+53,4
@@
/* Preserve environment on eMMC */
/* Preserve environment on eMMC */
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_MAXARGS 64 /* max command args */
-
#endif /* __HIKEY_H */
#endif /* __HIKEY_H */