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 2bb9e59..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_SPL_BUILD
 #include <config_distro_bootcmd.h>
 
 #ifdef CONFIG_CMD_MMC
@@ -20,7 +19,7 @@
 #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
@@ -35,9 +34,6 @@
        BOOT_TARGET_DEVICE_MMC(func)    \
        BOOT_TARGET_DEVICE_UBIFS(func)  \
        BOOT_TARGET_DEVICE_USB(func)
-#else
-#define BOOTENV
-#endif
 
 #define CONFIG_SYS_MONITOR_LEN         0x00200000      /* 2MB */
 
@@ -58,8 +54,6 @@
 #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 \
@@ -175,7 +169,7 @@
 
 /* only for SPL */
 
-/* subtract sizeof(struct image_header) */
+/* subtract sizeof(struct legacy_img_hdr) */
 #define CONFIG_SYS_UBOOT_BASE                  (0x130000 - 0x40)
 
 #endif /* __CONFIG_UNIPHIER_H__ */