Merge tag 'efi-2020-07-rc2-4' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / include / configs / evb_rk3229.h

diff --git a/include/configs/evb_rk3229.h b/include/configs/evb_rk3229.h
index 8f8e50fb60d8e11a5a2ea35df89f92f25d396974..6a91a82ceb46224f026c7842fd1c3487ae5c628d 100644 (file)
--- a/include/configs/evb_rk3229.h
+++ b/include/configs/evb_rk3229.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2017 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -9,52 +8,6 @@
 
 #include <configs/rk322x_common.h>
 
-
-/* Store env in emmc */
-#undef CONFIG_ENV_SIZE
-#define CONFIG_ENV_SIZE                 (32 << 10)
-#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV          0
-#define CONFIG_SYS_MMC_ENV_PART         0
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-
-#ifndef CONFIG_SPL_BUILD
-/* Enable gpt partition table */
-#undef PARTS_DEFAULT
-#define PARTS_DEFAULT \
-       "uuid_disk=${uuid_gpt_disk};" \
-       "name=loader_a,start=4M,size=4M,uuid=${uuid_gpt_loader};" \
-       "name=loader_b,size=4M,uuid=${uuid_gpt_reserved};" \
-       "name=trust_a,size=4M,uuid=${uuid_gpt_reserved};" \
-       "name=trust_b,size=4M,uuid=${uuid_gpt_reserved};" \
-       "name=misc,size=4M,uuid=${uuid_gpt_misc};" \
-       "name=metadata,size=16M,uuid=${uuid_gpt_metadata};" \
-       "name=boot_a,size=32M,uuid=${uuid_gpt_boot_a};" \
-       "name=boot_b,size=32M,uuid=${uuid_gpt_boot_b};" \
-       "name=system_a,size=818M,uuid=${uuid_gpt_system_a};" \
-       "name=system_b,size=818M,uuid=${uuid_gpt_system_b};" \
-       "name=vendor_a,size=50M,uuid=${uuid_gpt_vendor_a};" \
-       "name=vendor_b,size=50M,uuid=${uuid_gpt_vendor_b};" \
-       "name=cache,size=100M,uuid=${uuid_gpt_cache};" \
-       "name=persist,size=4M,uuid=${uuid_gpt_persist};" \
-       "name=userdata,size=-,uuid=${uuid_gpt_userdata};\0" \
-
-#define CONFIG_PREBOOT
-
-#define CONFIG_ANDROID_BOOT_IMAGE
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
-#undef CONFIG_BOOTCOMMAND
-#define CONFIG_BOOTCOMMAND \
-       "mmc read 0x61000000 0x8000 0x5000;" \
-       "bootm 0x61000000" \
-
-/* Enable atags */
-#define CONFIG_SYS_BOOTPARAMS_LEN      (64*1024)
-#define CONFIG_INITRD_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_CMDLINE_TAG
-
-#endif
+#define CONFIG_SYS_MMC_ENV_DEV 0
 
 #endif