Merge tag 'next-20220328' of https://source.denx.de/u-boot/custodians/u-boot-video...

[platform/kernel/u-boot.git] / include / configs / meson64.h

diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index f9bb024..196e58e 100644 (file)
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -29,17 +29,11 @@
 #define STDIN_CFG "serial"
 #endif
 
-#define CONFIG_CPU_ARMV8
-#define CONFIG_REMAKE_ELF
 #define CONFIG_SYS_MAXARGS             32
-#ifndef CONFIG_SYS_MALLOC_LEN
-#define CONFIG_SYS_MALLOC_LEN          (32 << 20)
-#endif
 #define CONFIG_SYS_CBSIZE              1024
 
 #define CONFIG_SYS_SDRAM_BASE          0
 #define CONFIG_SYS_INIT_SP_ADDR                0x20000000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_BOOTM_LEN           (64 << 20) /* 64 MiB */
 
 /* ROM USB boot support, auto-execute boot.scr at scriptaddr */
@@ -66,6 +60,12 @@
        #define BOOT_TARGET_NVME(func)
 #endif
 
+#ifdef CONFIG_CMD_SCSI
+       #define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0)
+#else
+       #define BOOT_TARGET_SCSI(func)
+#endif
+
 #ifndef BOOT_TARGET_DEVICES
 #define BOOT_TARGET_DEVICES(func) \
        func(ROMUSB, romusb, na)  \
@@ -74,6 +74,7 @@
        func(MMC, mmc, 2) \
        BOOT_TARGET_DEVICES_USB(func) \
        BOOT_TARGET_NVME(func) \
+       BOOT_TARGET_SCSI(func) \
        func(PXE, pxe, na) \
        func(DHCP, dhcp, na)
 #endif