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 'next-20220328' of https://source.denx.de/u-boot/custodians/u-boot-video...
[platform/kernel/u-boot.git]
/
include
/
configs
/
uniphier.h
diff --git
a/include/configs/uniphier.h
b/include/configs/uniphier.h
index
740249a
..
834943a
100644
(file)
--- a/
include/configs/uniphier.h
+++ b/
include/configs/uniphier.h
@@
-7,8
+7,8
@@
/* U-Boot - Common settings for UniPhier Family */
/* U-Boot - Common settings for UniPhier Family */
-#ifndef __CONFIG_UNIPHIER_
COMMON_
H__
-#define __CONFIG_UNIPHIER_
COMMON_
H__
+#ifndef __CONFIG_UNIPHIER_H__
+#define __CONFIG_UNIPHIER_H__
#ifndef CONFIG_SPL_BUILD
#include <config_distro_bootcmd.h>
#ifndef CONFIG_SPL_BUILD
#include <config_distro_bootcmd.h>
@@
-39,10
+39,6
@@
#define BOOTENV
#endif
#define BOOTENV
#endif
-#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024)
-
-#define CONFIG_TIMESTAMP
-
#define CONFIG_SYS_MONITOR_BASE 0
#define CONFIG_SYS_MONITOR_LEN 0x00200000 /* 2MB */
#define CONFIG_SYS_MONITOR_BASE 0
#define CONFIG_SYS_MONITOR_LEN 0x00200000 /* 2MB */
@@
-56,10
+52,8
@@
#endif
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#endif
#define CONFIG_SYS_MAX_NAND_DEVICE 1
-#define CONFIG_SYS_NAND_ONFI_DETECTION
#define CONFIG_SYS_NAND_REGS_BASE 0x68100000
#define CONFIG_SYS_NAND_DATA_BASE 0x68000000
#define CONFIG_SYS_NAND_REGS_BASE 0x68100000
#define CONFIG_SYS_NAND_DATA_BASE 0x68000000
-#define CONFIG_SYS_NAND_BAD_BLOCK_POS 0
/*
* Network Configuration
/*
* Network Configuration
@@
-69,7
+63,6
@@
#define CONFIG_GATEWAYIP 192.168.11.1
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_GATEWAYIP 192.168.11.1
#define CONFIG_NETMASK 255.255.255.0
-#define CONFIG_SYS_LOAD_ADDR 0x85000000
#define CONFIG_SYS_BOOTM_LEN (32 << 20)
#if defined(CONFIG_ARM64)
#define CONFIG_SYS_BOOTM_LEN (32 << 20)
#if defined(CONFIG_ARM64)
@@
-84,14
+77,8
@@
#endif
#define CONFIG_ROOTPATH "/nfs/root/path"
#endif
#define CONFIG_ROOTPATH "/nfs/root/path"
-#define CONFIG_NFSBOOTCOMMAND \
- "setenv bootargs $bootargs root=/dev/nfs rw " \
- "nfsroot=$serverip:$rootpath " \
- "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off;" \
- "run __nfsboot"
#ifdef CONFIG_FIT
#ifdef CONFIG_FIT
-#define CONFIG_BOOTFILE "fitImage"
#define KERNEL_ADDR_R_OFFSET "0x05100000"
#define LINUXBOOT_ENV_SETTINGS \
"tftpboot=tftpboot $kernel_addr_r $bootfile &&" \
#define KERNEL_ADDR_R_OFFSET "0x05100000"
#define LINUXBOOT_ENV_SETTINGS \
"tftpboot=tftpboot $kernel_addr_r $bootfile &&" \
@@
-99,11
+86,9
@@
"__nfsboot=run tftpboot\0"
#else
#ifdef CONFIG_ARM64
"__nfsboot=run tftpboot\0"
#else
#ifdef CONFIG_ARM64
-#define CONFIG_BOOTFILE "Image"
#define LINUXBOOT_CMD "booti"
#define KERNEL_ADDR_R_OFFSET "0x02080000"
#else
#define LINUXBOOT_CMD "booti"
#define KERNEL_ADDR_R_OFFSET "0x02080000"
#else
-#define CONFIG_BOOTFILE "zImage"
#define LINUXBOOT_CMD "bootz"
#define KERNEL_ADDR_R_OFFSET "0x00208000"
#endif
#define LINUXBOOT_CMD "bootz"
#define KERNEL_ADDR_R_OFFSET "0x00208000"
#endif
@@
-198,8
+183,6
@@
/* only for SPL */
#define CONFIG_SPL_STACK (0x00100000)
/* only for SPL */
#define CONFIG_SPL_STACK (0x00100000)
-#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000
-
/* subtract sizeof(struct image_header) */
#define CONFIG_SYS_UBOOT_BASE (0x130000 - 0x40)
/* subtract sizeof(struct image_header) */
#define CONFIG_SYS_UBOOT_BASE (0x130000 - 0x40)
@@
-210,4
+193,4
@@
#define CONFIG_SPL_PAD_TO 0x20000
#define CONFIG_SPL_PAD_TO 0x20000
-#endif /* __CONFIG_UNIPHIER_
COMMON_
H__ */
+#endif /* __CONFIG_UNIPHIER_H__ */