Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[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 be53e65..68e1105 100644 (file)
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -1,36 +1,61 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #ifndef _ROCKCHIP_COMMON_H_
 #define _ROCKCHIP_COMMON_H_
 #include <linux/sizes.h>
 
+#define CONFIG_SYS_NS16550_MEM32
+
 #ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
 
-/* First try to boot from SD (index 0), then eMMC (index 1 */
+/* First try to boot from SD (index 0), then eMMC (index 1) */
+#if CONFIG_IS_ENABLED(CMD_MMC)
+       #define BOOT_TARGET_MMC(func) \
+               func(MMC, mmc, 0) \
+               func(MMC, mmc, 1)
+#else
+       #define BOOT_TARGET_MMC(func)
+#endif
+
+#if CONFIG_IS_ENABLED(CMD_USB)
+       #define BOOT_TARGET_USB(func) func(USB, usb, 0)
+#else
+       #define BOOT_TARGET_USB(func)
+#endif
+
+#if CONFIG_IS_ENABLED(CMD_PXE)
+       #define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
+#else
+       #define BOOT_TARGET_PXE(func)
+#endif
+
+#if CONFIG_IS_ENABLED(CMD_DHCP)
+       #define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na)
+#else
+       #define BOOT_TARGET_DHCP(func)
+#endif
+
 #define BOOT_TARGET_DEVICES(func) \
-       func(MMC, mmc, 0) \
-       func(MMC, mmc, 1) \
-       func(PXE, pxe, na) \
-       func(DHCP, dchp, na)
-
- /* Enable gpt partition table */
-#define CONFIG_CMD_GPT
-#define CONFIG_RANDOM_UUID
-#define CONFIG_PARTITION_UUIDS
+       BOOT_TARGET_MMC(func) \
+       BOOT_TARGET_USB(func) \
+       BOOT_TARGET_PXE(func) \
+       BOOT_TARGET_DHCP(func)
+
+#ifdef CONFIG_ARM64
+#define ROOT_UUID "B921B045-1DF0-41C3-AF44-4C6F280D3FAE;\0"
+#else
+#define ROOT_UUID "69DAD710-2CE4-4E3C-B16C-21A1D49ABED3;\0"
+#endif
 #define PARTS_DEFAULT \
        "uuid_disk=${uuid_gpt_disk};" \
        "name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};" \
-       "name=reserved1,size=64K,uuid=${uuid_gpt_reserved1};" \
-       "name=reserved2,size=4M,uuid=${uuid_gpt_reserved2};" \
-       "name=loader2,size=4MB,uuid=${uuid_gpt_loader2};" \
-       "name=atf,size=4M,uuid=${uuid_gpt_atf};" \
+       "name=loader2,start=8MB,size=4MB,uuid=${uuid_gpt_loader2};" \
+       "name=trust,size=4M,uuid=${uuid_gpt_atf};" \
        "name=boot,size=112M,bootable,uuid=${uuid_gpt_boot};" \
-       "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \
+       "name=rootfs,size=-,uuid="ROOT_UUID
 
 #endif