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_EXTRA_ENV_SETTINGS to CFG
[platform/kernel/u-boot.git]
/
include
/
configs
/
uniphier.h
diff --git
a/include/configs/uniphier.h
b/include/configs/uniphier.h
index
15ae084
..
ecf0d2a
100644
(file)
--- a/
include/configs/uniphier.h
+++ b/
include/configs/uniphier.h
@@
-35,24
+35,17
@@
BOOT_TARGET_DEVICE_UBIFS(func) \
BOOT_TARGET_DEVICE_USB(func)
BOOT_TARGET_DEVICE_UBIFS(func) \
BOOT_TARGET_DEVICE_USB(func)
-#define CONFIG_SYS_MONITOR_LEN 0x00200000 /* 2MB */
-
#if !defined(CONFIG_ARM64)
/* Time clock 1MHz */
#if !defined(CONFIG_ARM64)
/* Time clock 1MHz */
-#define C
ONFIG_SYS_TIMER_RATE
1000000
+#define C
FG_SYS_TIMER_RATE
1000000
#endif
#endif
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
-#define CONFIG_SYS_NAND_REGS_BASE 0x68100000
-#define CONFIG_SYS_NAND_DATA_BASE 0x68000000
+#define CFG_SYS_NAND_REGS_BASE 0x68100000
+#define CFG_SYS_NAND_DATA_BASE 0x68000000
/*
* Network Configuration
*/
/*
* Network Configuration
*/
-#define CONFIG_SERVERIP 192.168.11.1
-#define CONFIG_IPADDR 192.168.11.10
-#define CONFIG_GATEWAYIP 192.168.11.1
-#define CONFIG_NETMASK 255.255.255.0
#if defined(CONFIG_ARM64)
/* ARM Trusted Firmware */
#if defined(CONFIG_ARM64)
/* ARM Trusted Firmware */
@@
-65,8
+58,6
@@
"third_image=u-boot.bin\0"
#endif
"third_image=u-boot.bin\0"
#endif
-#define CONFIG_ROOTPATH "/nfs/root/path"
-
#ifdef CONFIG_FIT
#define KERNEL_ADDR_R_OFFSET "0x05100000"
#define LINUXBOOT_ENV_SETTINGS \
#ifdef CONFIG_FIT
#define KERNEL_ADDR_R_OFFSET "0x05100000"
#define LINUXBOOT_ENV_SETTINGS \
@@
-95,7
+86,7
@@
"run boot_common\0"
#endif
"run boot_common\0"
#endif
-#define C
ONFIG_EXTRA_ENV_SETTINGS
\
+#define C
FG_EXTRA_ENV_SETTINGS
\
"fdt_addr_r_offset=0x05100000\0" \
"kernel_addr_r_offset=" KERNEL_ADDR_R_OFFSET "\0" \
"ramdisk_addr_r_offset=0x06000000\0" \
"fdt_addr_r_offset=0x05100000\0" \
"kernel_addr_r_offset=" KERNEL_ADDR_R_OFFSET "\0" \
"ramdisk_addr_r_offset=0x06000000\0" \
@@
-165,11
+156,11
@@
LINUXBOOT_ENV_SETTINGS \
BOOTENV
LINUXBOOT_ENV_SETTINGS \
BOOTENV
-#define C
ONFIG_SYS_BOOTMAPSZ
0x20000000
+#define C
FG_SYS_BOOTMAPSZ
0x20000000
/* only for SPL */
/* only for SPL */
-/* subtract sizeof(struct
image_heade
r) */
-#define C
ONFIG_SYS_UBOOT_BASE
(0x130000 - 0x40)
+/* subtract sizeof(struct
legacy_img_hd
r) */
+#define C
FG_SYS_UBOOT_BASE
(0x130000 - 0x40)
#endif /* __CONFIG_UNIPHIER_H__ */
#endif /* __CONFIG_UNIPHIER_H__ */