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 'video-20221030' 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
42a5029
..
d9e95ab
100644
(file)
--- a/
include/configs/uniphier.h
+++ b/
include/configs/uniphier.h
@@
-10,7
+10,6
@@
#ifndef __CONFIG_UNIPHIER_H__
#define __CONFIG_UNIPHIER_H__
#ifndef __CONFIG_UNIPHIER_H__
#define __CONFIG_UNIPHIER_H__
-#ifndef CONFIG_SPL_BUILD
#include <config_distro_bootcmd.h>
#ifdef CONFIG_CMD_MMC
#include <config_distro_bootcmd.h>
#ifdef CONFIG_CMD_MMC
@@
-20,7
+19,7
@@
#endif
#ifdef CONFIG_CMD_UBIFS
#endif
#ifdef CONFIG_CMD_UBIFS
-#define BOOT_TARGET_DEVICE_UBIFS(func) func(UBIFS, ubifs, 0)
+#define BOOT_TARGET_DEVICE_UBIFS(func) func(UBIFS, ubifs, 0
, UBI, boot
)
#else
#define BOOT_TARGET_DEVICE_UBIFS(func)
#endif
#else
#define BOOT_TARGET_DEVICE_UBIFS(func)
#endif
@@
-35,31
+34,17
@@
BOOT_TARGET_DEVICE_MMC(func) \
BOOT_TARGET_DEVICE_UBIFS(func) \
BOOT_TARGET_DEVICE_USB(func)
BOOT_TARGET_DEVICE_MMC(func) \
BOOT_TARGET_DEVICE_UBIFS(func) \
BOOT_TARGET_DEVICE_USB(func)
-#else
-#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_LEN 0x00200000 /* 2MB */
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE)
-
#if !defined(CONFIG_ARM64)
/* Time clock 1MHz */
#define CONFIG_SYS_TIMER_RATE 1000000
#endif
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#if !defined(CONFIG_ARM64)
/* Time clock 1MHz */
#define CONFIG_SYS_TIMER_RATE 1000000
#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,8
+54,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_BOOTM_LEN (32 << 20)
-
#if defined(CONFIG_ARM64)
/* ARM Trusted Firmware */
#define BOOT_IMAGES \
#if defined(CONFIG_ARM64)
/* ARM Trusted Firmware */
#define BOOT_IMAGES \
@@
-83,14
+66,8
@@
#endif
#define CONFIG_ROOTPATH "/nfs/root/path"
#endif
#define CONFIG_ROOTPATH "/nfs/root/path"
-#define 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 &&" \
@@
-98,11
+75,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
@@
-192,23
+167,9
@@
#define CONFIG_SYS_BOOTMAPSZ 0x20000000
#define CONFIG_SYS_BOOTMAPSZ 0x20000000
-#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE)
-
/* only for SPL */
/* only for SPL */
-#define CONFIG_SPL_STACK (0x00100000)
-
-#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000
-/* subtract sizeof(struct
image_heade
r) */
+/* subtract sizeof(struct
legacy_img_hd
r) */
#define CONFIG_SYS_UBOOT_BASE (0x130000 - 0x40)
#define CONFIG_SYS_UBOOT_BASE (0x130000 - 0x40)
-#define CONFIG_SPL_TARGET "u-boot-with-spl.bin"
-#define CONFIG_SPL_MAX_FOOTPRINT 0x10000
-#define CONFIG_SPL_MAX_SIZE 0x10000
-#define CONFIG_SPL_BSS_MAX_SIZE 0x2000
-
-#define CONFIG_SPL_PAD_TO 0x20000
-
-#define CONFIG_SYS_PCI_64BIT
-
#endif /* __CONFIG_UNIPHIER_H__ */
#endif /* __CONFIG_UNIPHIER_H__ */