Merge tag 'u-boot-at91-2023.07-a' of https://source.denx.de/u-boot/custodians/u-boot...

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

diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index 4c964cc..18544d7 100644 (file)
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -7,14 +7,14 @@
 #define _ROCKCHIP_COMMON_H_
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_NS16550_MEM32
-
-/* ((CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR - 64) * 512) */
+#ifndef CFG_CPUID_OFFSET
+#define CFG_CPUID_OFFSET       0x7
+#endif
 
 #ifndef CONFIG_SPL_BUILD
 
 /* First try to boot from SD (index 1), then eMMC (index 0) */
-#if CONFIG_IS_ENABLED(CMD_MMC)
+#if IS_ENABLED(CONFIG_CMD_MMC)
        #define BOOT_TARGET_MMC(func) \
                func(MMC, mmc, 1) \
                func(MMC, mmc, 0)
@@ -22,19 +22,19 @@
        #define BOOT_TARGET_MMC(func)
 #endif
 
-#if CONFIG_IS_ENABLED(CMD_NVME)
+#if IS_ENABLED(CONFIG_CMD_NVME)
        #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0)
 #else
        #define BOOT_TARGET_NVME(func)
 #endif
 
-#if CONFIG_IS_ENABLED(CMD_SCSI)
+#if IS_ENABLED(CONFIG_CMD_SCSI)
        #define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0)
 #else
        #define BOOT_TARGET_SCSI(func)
 #endif
 
-#if CONFIG_IS_ENABLED(CMD_USB)
+#if IS_ENABLED(CONFIG_CMD_USB)
        #define BOOT_TARGET_USB(func) func(USB, usb, 0)
 #else
        #define BOOT_TARGET_USB(func)
@@ -52,7 +52,7 @@
        #define BOOT_TARGET_DHCP(func)
 #endif
 
-#if CONFIG_IS_ENABLED(CMD_SF)
+#if IS_ENABLED(CONFIG_CMD_SF)
        #define BOOT_TARGET_SF(func)    func(SF, sf, 0)
 #else
        #define BOOT_TARGET_SF(func)
@@ -67,12 +67,14 @@
        BOOT_TARGET_PXE(func) \
        BOOT_TARGET_DHCP(func) \
        BOOT_TARGET_SF(func)
+#define BOOT_TARGETS   "mmc1 mmc0 nvme scsi usb pxe dhcp spi"
 #else
 #define BOOT_TARGET_DEVICES(func) \
        BOOT_TARGET_MMC(func) \
        BOOT_TARGET_USB(func) \
        BOOT_TARGET_PXE(func) \
        BOOT_TARGET_DHCP(func)
+#define BOOT_TARGETS   "mmc1 mmc0 usb pxe dhcp"
 #endif
 
 #ifdef CONFIG_ARM64